From 7c318dbd15fd3dbe4e3e38e7b269fa6ce0720b62 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Tue, 22 Nov 2022 20:02:40 -0300
Subject: [PATCH 01/20] adding initial texts for search/home view

---
 src/views/HomeView.vue | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 20d2bfe..b4a8582 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,5 +1,34 @@
 <script setup lang="ts"></script>
 
 <template>
-  <h2 v-bind:hidden="true">Home View</h2>
+  <div class="page">
+    <div class="text-container">
+      <span class="text font-extrabold text-5xl max-w-[29rem]"
+        >Adquira crypto com apenas um Pix</span
+      >
+      <span class="text font-medium text-base max-w-[28rem]"
+        >Digite um valor, selecione uma oferta, conecta sua carteira e receba a
+        crypto após realizar o Pix</span
+      >
+    </div>
+    <!-- <div
+      class="flex flex-col justify-center items-start px-8 py-6 gap-2 rounded-lg shadow-current backdrop-blur-md w-96 mt-10"
+    >
+    </div> 
+    Search component
+  --></div>
 </template>
+
+<style scoped>
+.page {
+  @apply flex flex-col items-center justify-center w-full mt-20;
+}
+
+.text-container {
+  @apply flex flex-col items-center justify-center gap-4;
+}
+
+.text {
+  @apply text-gray-800 text-center;
+}
+</style>

From c5322854aad3d4144a7bc4d2214383497654698d Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Wed, 23 Nov 2022 18:07:18 -0300
Subject: [PATCH 02/20] add custom button component

Co-authored-by: Esio Freitas <esio.gustavo@gmail.com>
---
 src/components/CustomButton.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/components/CustomButton.vue

diff --git a/src/components/CustomButton.vue b/src/components/CustomButton.vue
new file mode 100644
index 0000000..baa0408
--- /dev/null
+++ b/src/components/CustomButton.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+const props = defineProps({
+  text: String,
+  isDisabled: Boolean
+})
+
+const emit = defineEmits(['clicked'])
+</script>
+
+<template>
+    <button type="button" class="button" @click="emit('clicked')" v-bind:class="{'opacity-70': isDisabled}" :disabled="isDisabled">
+        {{ text }}
+    </button>
+</template>
+
+<style scoped>
+.button {
+  @apply rounded-lg w-full text-base font-semibold text-gray-900 py-4 bg-amber-400;
+}
+</style>

From 0b1a59b3333049c131650f41c0a7ba33126c2b44 Mon Sep 17 00:00:00 2001
From: EsioFreitas <esio.gustavo@gmail.com>
Date: Wed, 23 Nov 2022 18:12:04 -0300
Subject: [PATCH 03/20] feat: add search token card

Co-authored-by: RcleydsonR <rafael.cleydson@gmail.com>
---
 src/assets/arrow.svg            |  3 ++
 src/assets/brz.svg              | 18 ++++++++++
 src/components/CustomButton.vue | 18 ++++++----
 src/views/HomeView.vue          | 62 +++++++++++++++++++++++++++++----
 4 files changed, 89 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/arrow.svg
 create mode 100644 src/assets/brz.svg

diff --git a/src/assets/arrow.svg b/src/assets/arrow.svg
new file mode 100644
index 0000000..4e6a769
--- /dev/null
+++ b/src/assets/arrow.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="16" viewBox="0 0 10 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1.5C4 0.947715 4.44772 0.5 5 0.5C5.55229 0.5 6 0.947715 6 1.5V12.0858L8.29289 9.79289C8.68342 9.40237 9.31658 9.40237 9.70711 9.79289C10.0976 10.1834 10.0976 10.8166 9.70711 11.2071L5.70711 15.2071C5.31658 15.5976 4.68342 15.5976 4.29289 15.2071L0.292893 11.2071C-0.0976311 10.8166 -0.0976311 10.1834 0.292893 9.79289C0.683417 9.40237 1.31658 9.40237 1.70711 9.79289L4 12.0858V1.5Z" fill="white"/>
+</svg>
diff --git a/src/assets/brz.svg b/src/assets/brz.svg
new file mode 100644
index 0000000..7300494
--- /dev/null
+++ b/src/assets/brz.svg
@@ -0,0 +1,18 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_257_714)">
+<path d="M16 32C24.8366 32 32 24.8366 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32Z" fill="#170636"/>
+<path d="M24.269 9.72809L20.1404 13.8568L24.269 17.9854L28.3977 13.8568L24.269 9.72809Z" fill="#14B23D"/>
+<path d="M7.76489 9.68823L3.63623 13.8169L7.76489 17.9456L11.8936 13.8169L7.76489 9.68823Z" fill="#FFC100"/>
+<path d="M16.0261 17.9628L11.8975 22.0915L16.0261 26.2202L20.1548 22.0915L16.0261 17.9628Z" fill="#14B23D"/>
+<path d="M7.76196 9.69141L16.0274 17.9568H24.2549L15.9895 9.69141H7.76196Z" fill="url(#paint0_linear_257_714)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_257_714" x1="9.81965" y1="7.64005" x2="13.4843" y2="22.2149" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFDC00"/>
+<stop offset="1" stop-color="#07E58A"/>
+</linearGradient>
+<clipPath id="clip0_257_714">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/CustomButton.vue b/src/components/CustomButton.vue
index baa0408..212fbf3 100644
--- a/src/components/CustomButton.vue
+++ b/src/components/CustomButton.vue
@@ -1,16 +1,22 @@
 <script setup lang="ts">
 const props = defineProps({
   text: String,
-  isDisabled: Boolean
-})
+  isDisabled: Boolean,
+});
 
-const emit = defineEmits(['clicked'])
+const emit = defineEmits(["clicked"]);
 </script>
 
 <template>
-    <button type="button" class="button" @click="emit('clicked')" v-bind:class="{'opacity-70': isDisabled}" :disabled="isDisabled">
-        {{ text }}
-    </button>
+  <button
+    type="button"
+    class="button"
+    @click="emit('clicked')"
+    v-bind:class="{ 'opacity-70': isDisabled }"
+    :disabled="isDisabled"
+  >
+    {{ text }}
+  </button>
 </template>
 
 <style scoped>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index b4a8582..edcc836 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,4 +1,9 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import CustomButton from "../components/CustomButton.vue";
+const searchClick = () => {
+  console.log("oferta selecionada");
+};
+</script>
 
 <template>
   <div class="page">
@@ -11,15 +16,60 @@
         crypto após realizar o Pix</span
       >
     </div>
-    <!-- <div
-      class="flex flex-col justify-center items-start px-8 py-6 gap-2 rounded-lg shadow-current backdrop-blur-md w-96 mt-10"
+    <div
+      class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
     >
-    </div> 
-    Search component
-  --></div>
+      <div
+        class="flex justify-between w-full bg-white px-10 py-5 rounded-lg border-y-10 relative"
+      >
+        <input
+          type="number"
+          class="border-none outline-none text-lg"
+          placeholder="Digite o valor que deseja pagar"
+        />
+        <p class="text-lg font-bold">R$</p>
+      </div>
+
+      <div
+        class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
+      >
+        <div
+          class="bg-emerald-400 px-4 py-3 rounded-lg absolute bottom-position"
+        >
+          <img alt="Ethereum image" src="@/assets/arrow.svg" />
+        </div>
+
+        <div class="flex justify-between w-full items-center">
+          <p class="text-3xl">0</p>
+          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
+            <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
+            <p class="text-gray-900 text-lg">BRZ</p>
+          </div>
+        </div>
+
+        <div class="custom-divide py-2"></div>
+        <p class="text-gray-500 text-lg pt-2">~ ETH 0,00 (+0,121%)</p>
+      </div>
+      <CustomButton
+        :text="'Selecionar Oferta'"
+        :is-disabled="true"
+        @clicked="searchClick()"
+      />
+    </div>
+  </div>
 </template>
 
 <style scoped>
+.custom-divide {
+  width: 100%;
+  border-bottom: 1px solid #d1d5db;
+}
+.bottom-position {
+  top: -20px;
+  right: 50%;
+  transform: translateX(50%);
+}
+
 .page {
   @apply flex flex-col items-center justify-center w-full mt-20;
 }

From b8e5f5c408c35fc48c83691385807e6601ba5b04 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Thu, 24 Nov 2022 13:05:33 -0300
Subject: [PATCH 04/20] Mock tokens implementation

---
 src/router/index.ts                         |  6 ++
 src/store/ether.ts                          |  4 +
 src/utils/blockchain.ts                     | 88 ++++++++++++++++++---
 src/utils/smart_contract_files/wallets.json |  8 ++
 src/views/MockView.vue                      | 85 ++++++++++++++++++++
 tsconfig.json                               |  3 +-
 6 files changed, 180 insertions(+), 14 deletions(-)
 create mode 100644 src/utils/smart_contract_files/wallets.json
 create mode 100644 src/views/MockView.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index bd6a7af..c4ce70f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,6 +1,7 @@
 import { createRouter, createWebHistory } from "vue-router";
 import HomeView from "../views/HomeView.vue";
 import QrCodeFormVue from "../views/QrCodeForm.vue";
+import MockView from "../views/MockView.vue";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -15,6 +16,11 @@ const router = createRouter({
       name: "pix",
       component: QrCodeFormVue,
     },
+    {
+      path: "/mock",
+      name: "mock",
+      component: MockView,
+    },
   ],
 });
 
diff --git a/src/store/ether.ts b/src/store/ether.ts
index b777179..0afd6ff 100644
--- a/src/store/ether.ts
+++ b/src/store/ether.ts
@@ -4,6 +4,7 @@ export const useEtherStore = defineStore("ether", {
   state: () => ({
     walletAddress: "",
     balance: "",
+    depositList: {},
   }),
   actions: {
     setWalletAddress(walletAddress: string) {
@@ -12,5 +13,8 @@ export const useEtherStore = defineStore("ether", {
     setBalance(balance: string) {
       this.balance = balance;
     },
+    setDepositList(depositList: {}) {
+      this.depositList = depositList;
+    },
   },
 });
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 5a7ad3c..897b613 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -3,9 +3,11 @@ import { ethers } from "ethers";
 
 // smart contract imports
 import mockToken from "./smart_contract_files/MockToken.json";
-//import p2pix from "./smart_contract_files/P2PIX.json";
+import p2pix from "./smart_contract_files/P2PIX.json";
 import addresses from "./smart_contract_files/localhost.json";
 
+import { wallets } from "./smart_contract_files/wallets.json"
+
 const updateWalletStatus = async (walletAddress: string) => {
   const etherStore = useEtherStore();
   const provider = getProvider();
@@ -37,29 +39,89 @@ const connectProvider = async () => {
   etherStore.setWalletAddress(walletAddress[0]);
   etherStore.setBalance(String(balance));
 
+  const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.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]);
   });
 };
 
-const makeTransaction = async (
-  receiverAccountAddress = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-  ammount = "100.0"
-) => {
+const splitTokens = async () => {
   const etherStore = useEtherStore();
-  const provider = getProvider();
-  if (!provider) return;
+  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 tx = await contract.transfer(
-    receiverAccountAddress,
-    ethers.utils.parseEther(ammount)
-  );
-  await tx.wait();
+  for (var i = 0; i < wallets.length; i++){
+    const tx = await contract.transfer(wallets[i], ethers.utils.parseEther("4000000.0"));
+    await tx.wait()
+    updateWalletStatus(etherStore.walletAddress);
+  }
+  
+};
+
+const mockDeposit = 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 p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+
+  // first get the approval
+  const apprv = await tokenContract.approve(addresses.p2pix, ethers.utils.parseEther("1000.0"));
+  await apprv.wait();
+
+  // deposit
+  const mockPixKey = "00011122233";
+  const deposit = await p2pContract.deposit(addresses.token, ethers.utils.parseEther("1000.0"), mockPixKey);
+  await deposit.wait();
 
   updateWalletStatus(etherStore.walletAddress);
+
+  const filter = p2pContract.filters.DepositAdded(null);
+  const events = await p2pContract.queryFilter(filter);
+
+  console.log(events)
+
+  etherStore.setDepositList(events);
+
+};
+
+
+const countDeposit = async () => {
+  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.p2pix, p2pix.abi, signer);
+
+  const count = await contract.depositCount();
+
+  console.log(Number(count))
 };
 
 const formatEther = (balance: string) => {
@@ -76,4 +138,4 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
   return new ethers.providers.Web3Provider(connection);
 };
 
-export default { connectProvider, formatEther, makeTransaction };
+export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit };
diff --git a/src/utils/smart_contract_files/wallets.json b/src/utils/smart_contract_files/wallets.json
new file mode 100644
index 0000000..3dd7eb2
--- /dev/null
+++ b/src/utils/smart_contract_files/wallets.json
@@ -0,0 +1,8 @@
+{
+    "wallets":[
+        "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+        "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
+        "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
+        "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65"
+    ]
+}
\ No newline at end of file
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
new file mode 100644
index 0000000..594a4ac
--- /dev/null
+++ b/src/views/MockView.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { storeToRefs } from "pinia";
+import { useEtherStore } from "../store/ether";
+import blockchain from "../utils/blockchain";
+
+const etherStore = useEtherStore();
+
+const { walletAddress, balance, depositList } = storeToRefs(etherStore);
+
+const splitTokens = () => {
+  blockchain.splitTokens();
+};
+
+const mockDeposit = () => {
+  blockchain.mockDeposit();
+};
+
+const countDeposit = () => {
+  blockchain.countDeposit();
+};
+
+const formatWalletAddress = (): string => {
+  const walletAddressLength = walletAddress.value.length;
+  const initialText = walletAddress.value.substring(0, 5);
+  const finalText = walletAddress.value.substring(
+    walletAddressLength - 5,
+    walletAddressLength - 1
+  );
+  return `${initialText} ... ${finalText}`;
+};
+
+const formatWalletBalance = (): string => {
+  const formattedBalance = blockchain.formatEther(balance.value);
+  const fixed = formattedBalance.substring(0, 8);
+
+  return fixed;
+};
+</script>
+
+<template>
+  
+    <div class="flex gap-4 items-center">
+
+      <button 
+        type="button" 
+        class="p-2 rounded text-gray-50"
+        @click="countDeposit()"
+      >
+        Contar depósitos
+      </button>
+
+      <button 
+        type="button" 
+        class="p-2 rounded text-gray-50"
+        @click="mockDeposit()"
+      >
+        Mockar depósitos
+      </button>
+
+      <button 
+        type="button" 
+        class="p-2 rounded text-gray-50"
+        @click="splitTokens()"
+      >
+        Dividir tokens
+      </button>
+
+    </div>
+
+    <br>
+    <br>
+    <br>
+    <ul>
+      <center>
+        <li v-for="deposit in depositList" :key="deposit['blockNumber']">{{deposit['args']['0']}} : MRBZ {{blockchain.formatEther(deposit['args']['amount'])}} </li>
+      </center>
+    </ul>
+
+</template>
+
+<style scoped>
+header {
+  @apply flex flex-row justify-between w-full items-center;
+}
+</style>
diff --git a/tsconfig.json b/tsconfig.json
index 8d23599..e97787b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,8 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "resolveJsonModule": true,
   },
 
   "references": [

From 3e177cdc633f8430f9ea1a92368a86887aa60e08 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Thu, 24 Nov 2022 15:00:39 -0300
Subject: [PATCH 05/20] improve search component css

---
 src/assets/polygon.svg |  3 +++
 src/views/HomeView.vue | 40 ++++++++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/polygon.svg

diff --git a/src/assets/polygon.svg b/src/assets/polygon.svg
new file mode 100644
index 0000000..4caf8c9
--- /dev/null
+++ b/src/assets/polygon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24ZM14.7232 9.76501C15.0157 9.6188 15.3446 9.6188 15.6005 9.76501L18.5614 11.483C18.8538 11.6658 19 11.9582 19 12.2507V15.7232C19 16.0522 18.8172 16.3446 18.5614 16.4909L15.6005 18.2089C15.3081 18.3551 14.9791 18.3551 14.7232 18.2089L11.7624 16.4909C11.47 16.3081 11.3238 16.0157 11.3238 15.7232V14.517L12.7128 13.7128V14.8825C12.7128 15.2115 12.8956 15.5039 13.1514 15.6501L14.7232 16.564C15.0157 16.7102 15.3446 16.7102 15.6005 16.564L17.1358 15.6501C17.4282 15.4674 17.5744 15.1749 17.5744 14.8825V13.0548C17.5744 12.7258 17.3916 12.4334 17.1358 12.2872L15.564 11.3734C15.2715 11.2272 14.9426 11.2272 14.6867 11.3734L12.6762 12.5431L11.2872 13.3473L9.27676 14.517C8.98433 14.6632 8.65535 14.6632 8.39948 14.517L5.43864 12.799C5.14621 12.6162 5 12.3238 5 12.0313V8.5953C5 8.30287 5.14621 8.01044 5.43864 7.86423L8.43603 6.10966C8.72846 5.96345 9.05744 5.96345 9.31332 6.10966L12.2376 7.82768C12.53 8.01044 12.6762 8.30287 12.6762 8.5953V9.83812L11.2872 10.6423V9.43603C11.2872 9.10705 11.1044 8.81462 10.8486 8.66841L9.27676 7.71802C8.98433 7.5718 8.65535 7.5718 8.39948 7.71802L6.82768 8.63185C6.53525 8.81462 6.38903 9.10705 6.38903 9.39948V11.2272C6.38903 11.5561 6.5718 11.8486 6.82768 11.9948L8.39948 12.9452C8.69191 13.0914 9.02089 13.0914 9.27676 12.9452L11.2872 11.7389L12.6762 10.9713L14.7232 9.76501Z" fill="#6366F1"/>
+</svg>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index edcc836..bed7337 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
+import { ref } from "vue";
 import CustomButton from "../components/CustomButton.vue";
 const searchClick = () => {
-  console.log("oferta selecionada");
+  console.log(value);
 };
+
+const value = ref<Number>()
 </script>
 
 <template>
@@ -20,27 +23,29 @@ const searchClick = () => {
       class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
     >
       <div
-        class="flex justify-between w-full bg-white px-10 py-5 rounded-lg border-y-10 relative"
+        class="flex justify-between w-full bg-white px-10 py-5 rounded-lg border-y-10 relative gap-1"
       >
+        <p class="text-xl font-normal text-gray-900 mr-1" v-if="value != undefined && value.toString() != ''">R$</p>
         <input
           type="number"
-          class="border-none outline-none text-lg"
+          class="border-none outline-none text-lg text-gray-900 w-full"
+          v-bind:class="{ 'font-semibold': value != undefined, 'text-xl': value != undefined}"
           placeholder="Digite o valor que deseja pagar"
+          v-model="value"
         />
-        <p class="text-lg font-bold">R$</p>
+        <p class="text-xl font-normal text-gray-900" v-if="value == undefined || value.toString() == ''">R$</p>
       </div>
-
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
       >
         <div
-          class="bg-emerald-400 px-4 py-3 rounded-lg absolute bottom-position"
+          class="bg-emerald-400 px-3 py-2.5 rounded-lg absolute bottom-position w-8 h-8"
         >
-          <img alt="Ethereum image" src="@/assets/arrow.svg" />
+          <img alt="Ethereum image" src="@/assets/arrow.svg"/>
         </div>
 
         <div class="flex justify-between w-full items-center">
-          <p class="text-3xl">0</p>
+          <p class="text-3xl text-gray-900">0</p>
           <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
             <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
             <p class="text-gray-900 text-lg">BRZ</p>
@@ -48,11 +53,17 @@ const searchClick = () => {
         </div>
 
         <div class="custom-divide py-2"></div>
-        <p class="text-gray-500 text-lg pt-2">~ ETH 0,00 (+0,121%)</p>
+        <div class="flex justify-between pt-2">
+          <p class="text-gray-500 font-normal text-sm  w-fit">~ ETH 0,00 (+0,121%)</p>
+          <div class="flex gap-2">
+            <img alt="Polygon image" src="@/assets/polygon.svg" width="24px" height="24px"/>
+            <img alt="Ethereum image" src="@/assets/ethereum.svg" width="24px" height="24px"/>
+          </div>
+        </div>
       </div>
       <CustomButton
         :text="'Selecionar Oferta'"
-        :is-disabled="true"
+        :is-disabled="false"
         @clicked="searchClick()"
       />
     </div>
@@ -81,4 +92,13 @@ const searchClick = () => {
 .text {
   @apply text-gray-800 text-center;
 }
+
+input[type='number'] {
+    -moz-appearance:textfield;
+}
+
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+}
 </style>

From eb70e0d97021172468f8c22038f7fee085c6e57b Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Fri, 25 Nov 2022 15:27:01 -0300
Subject: [PATCH 06/20] update smart contract files and implement mapDeposits
 method to return specific info about a deposit

Co-authored-by: brunoedcf <brest.dallacosta@outlook.com>
---
 src/utils/blockchain.ts                       |  48 ++---
 src/utils/smart_contract_files/MockToken.json | 139 ++++++++-----
 src/utils/smart_contract_files/P2PIX.json     | 192 ++++++++++++++++--
 src/utils/smart_contract_files/wallets.json   |   4 +-
 src/views/MockView.vue                        |  80 ++++++--
 5 files changed, 339 insertions(+), 124 deletions(-)

diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 897b613..1942a9d 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -1,5 +1,5 @@
 import { useEtherStore } from "@/store/ether";
-import { ethers } from "ethers";
+import { BigNumber, ethers } from "ethers";
 
 // smart contract imports
 import mockToken from "./smart_contract_files/MockToken.json";
@@ -55,13 +55,9 @@ const connectProvider = async () => {
 
 const splitTokens = async () => {
   const etherStore = useEtherStore();
-  const window_ = window as any;
-  const connection = window_.ethereum;
-  let provider: ethers.providers.Web3Provider | null = null;
+  const provider = getProvider();
+  if (!provider) return;
 
-  if (!connection) return;
-
-  provider = new ethers.providers.Web3Provider(connection);
   const signer = provider.getSigner();
   const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
 
@@ -73,27 +69,23 @@ const splitTokens = async () => {
   
 };
 
-const mockDeposit = async () => {
+const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
   const etherStore = useEtherStore();
-  const window_ = window as any;
-  const connection = window_.ethereum;
-  let provider: ethers.providers.Web3Provider | null = null;
+  const provider = getProvider();
+  if (!provider) return;
 
-  if (!connection) return;
-
-  provider = new ethers.providers.Web3Provider(connection);
   const signer = provider.getSigner();
 
   const tokenContract = new ethers.Contract(addresses.token, mockToken.abi, signer);
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
   // first get the approval
-  const apprv = await tokenContract.approve(addresses.p2pix, ethers.utils.parseEther("1000.0"));
+  const apprv = await tokenContract.approve(addresses.p2pix, ethers.utils.parseEther(tokenQty));
   await apprv.wait();
 
+
   // deposit
-  const mockPixKey = "00011122233";
-  const deposit = await p2pContract.deposit(addresses.token, ethers.utils.parseEther("1000.0"), mockPixKey);
+  const deposit = await p2pContract.deposit(addresses.token, ethers.utils.parseEther(tokenQty), pixKey);
   await deposit.wait();
 
   updateWalletStatus(etherStore.walletAddress);
@@ -109,13 +101,9 @@ const mockDeposit = async () => {
 
 
 const countDeposit = async () => {
-  const window_ = window as any;
-  const connection = window_.ethereum;
-  let provider: ethers.providers.Web3Provider | null = null;
+  const provider = getProvider();
+  if (!provider) return;
 
-  if (!connection) return;
-
-  provider = new ethers.providers.Web3Provider(connection);
   const signer = provider.getSigner();
   const contract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
@@ -124,6 +112,18 @@ const countDeposit = async () => {
   console.log(Number(count))
 };
 
+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);
+
+  console.log(deposit)
+};
+
 const formatEther = (balance: string) => {
   const formatted = ethers.utils.formatEther(balance);
   return formatted;
@@ -138,4 +138,4 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
   return new ethers.providers.Web3Provider(connection);
 };
 
-export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit };
+export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit, mapDeposits };
diff --git a/src/utils/smart_contract_files/MockToken.json b/src/utils/smart_contract_files/MockToken.json
index 086e148..52181f5 100644
--- a/src/utils/smart_contract_files/MockToken.json
+++ b/src/utils/smart_contract_files/MockToken.json
@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "MockToken",
-  "sourceName": "contracts/mockToken.sol",
+  "sourceName": "contracts/lib/mock/mockToken.sol",
   "abi": [
     {
       "inputs": [
@@ -32,7 +32,7 @@
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "value",
+          "name": "amount",
           "type": "uint256"
         }
       ],
@@ -57,23 +57,36 @@
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "value",
+          "name": "amount",
           "type": "uint256"
         }
       ],
       "name": "Transfer",
       "type": "event"
     },
+    {
+      "inputs": [],
+      "name": "DOMAIN_SEPARATOR",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "owner",
+          "name": "",
           "type": "address"
         },
         {
           "internalType": "address",
-          "name": "spender",
+          "name": "",
           "type": "address"
         }
       ],
@@ -116,7 +129,7 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "",
           "type": "address"
         }
       ],
@@ -144,54 +157,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "name",
@@ -205,6 +170,68 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "nonces",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "deadline",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint8",
+          "name": "v",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "r",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "s",
+          "type": "bytes32"
+        }
+      ],
+      "name": "permit",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "symbol",
@@ -285,8 +312,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162000b8d38038062000b8d83398101604081905262000034916200021d565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b9084015281519192916200007f9160039162000177565b5080516200009590600490602084019062000177565b505050620000aa3382620000b160201b60201c565b506200029b565b6001600160a01b0382166200010c5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b806002600082825462000120919062000237565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b82805462000185906200025e565b90600052602060002090601f016020900481019282620001a95760008555620001f4565b82601f10620001c457805160ff1916838001178555620001f4565b82800160010185558215620001f4579182015b82811115620001f4578251825591602001919060010190620001d7565b506200020292915062000206565b5090565b5b8082111562000202576000815560010162000207565b6000602082840312156200023057600080fd5b5051919050565b600082198211156200025957634e487b7160e01b600052601160045260246000fd5b500190565b600181811c908216806200027357607f821691505b602082108114156200029557634e487b7160e01b600052602260045260246000fd5b50919050565b6108e280620002ab6000396000f3fe608060405234801561001057600080fd5b50600436106100c95760003560e01c80633950935111610081578063a457c2d71161005b578063a457c2d714610187578063a9059cbb1461019a578063dd62ed3e146101ad57600080fd5b8063395093511461014357806370a082311461015657806395d89b411461017f57600080fd5b806318160ddd116100b257806318160ddd1461010f57806323b872dd14610121578063313ce5671461013457600080fd5b806306fdde03146100ce578063095ea7b3146100ec575b600080fd5b6100d66101e6565b6040516100e39190610748565b60405180910390f35b6100ff6100fa3660046107b9565b610278565b60405190151581526020016100e3565b6002545b6040519081526020016100e3565b6100ff61012f3660046107e3565b610290565b604051601281526020016100e3565b6100ff6101513660046107b9565b6102b4565b61011361016436600461081f565b6001600160a01b031660009081526020819052604090205490565b6100d66102f3565b6100ff6101953660046107b9565b610302565b6100ff6101a83660046107b9565b6103b1565b6101136101bb366004610841565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6060600380546101f590610874565b80601f016020809104026020016040519081016040528092919081815260200182805461022190610874565b801561026e5780601f106102435761010080835404028352916020019161026e565b820191906000526020600020905b81548152906001019060200180831161025157829003601f168201915b5050505050905090565b6000336102868185856103bf565b5060019392505050565b60003361029e8582856104e3565b6102a9858585610575565b506001949350505050565b3360008181526001602090815260408083206001600160a01b038716845290915281205490919061028690829086906102ee9087906108af565b6103bf565b6060600480546101f590610874565b3360008181526001602090815260408083206001600160a01b0387168452909152812054909190838110156103a45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760448201527f207a65726f00000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6102a982868684036103bf565b600033610286818585610575565b6001600160a01b0383166104215760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b606482015260840161039b565b6001600160a01b0382166104825760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b606482015260840161039b565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6001600160a01b03838116600090815260016020908152604080832093861683529290522054600019811461056f57818110156105625760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000604482015260640161039b565b61056f84848484036103bf565b50505050565b6001600160a01b0383166105f15760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f20616460448201527f6472657373000000000000000000000000000000000000000000000000000000606482015260840161039b565b6001600160a01b0382166106535760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b606482015260840161039b565b6001600160a01b038316600090815260208190526040902054818110156106e25760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e742065786365656473206260448201527f616c616e63650000000000000000000000000000000000000000000000000000606482015260840161039b565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a361056f565b600060208083528351808285015260005b8181101561077557858101830151858201604001528201610759565b81811115610787576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b03811681146107b457600080fd5b919050565b600080604083850312156107cc57600080fd5b6107d58361079d565b946020939093013593505050565b6000806000606084860312156107f857600080fd5b6108018461079d565b925061080f6020850161079d565b9150604084013590509250925092565b60006020828403121561083157600080fd5b61083a8261079d565b9392505050565b6000806040838503121561085457600080fd5b61085d8361079d565b915061086b6020840161079d565b90509250929050565b600181811c9082168061088857607f821691505b602082108114156108a957634e487b7160e01b600052602260045260246000fd5b50919050565b600082198211156108d057634e487b7160e01b600052601160045260246000fd5b50019056fea164736f6c6343000809000a",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100c95760003560e01c80633950935111610081578063a457c2d71161005b578063a457c2d714610187578063a9059cbb1461019a578063dd62ed3e146101ad57600080fd5b8063395093511461014357806370a082311461015657806395d89b411461017f57600080fd5b806318160ddd116100b257806318160ddd1461010f57806323b872dd14610121578063313ce5671461013457600080fd5b806306fdde03146100ce578063095ea7b3146100ec575b600080fd5b6100d66101e6565b6040516100e39190610748565b60405180910390f35b6100ff6100fa3660046107b9565b610278565b60405190151581526020016100e3565b6002545b6040519081526020016100e3565b6100ff61012f3660046107e3565b610290565b604051601281526020016100e3565b6100ff6101513660046107b9565b6102b4565b61011361016436600461081f565b6001600160a01b031660009081526020819052604090205490565b6100d66102f3565b6100ff6101953660046107b9565b610302565b6100ff6101a83660046107b9565b6103b1565b6101136101bb366004610841565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6060600380546101f590610874565b80601f016020809104026020016040519081016040528092919081815260200182805461022190610874565b801561026e5780601f106102435761010080835404028352916020019161026e565b820191906000526020600020905b81548152906001019060200180831161025157829003601f168201915b5050505050905090565b6000336102868185856103bf565b5060019392505050565b60003361029e8582856104e3565b6102a9858585610575565b506001949350505050565b3360008181526001602090815260408083206001600160a01b038716845290915281205490919061028690829086906102ee9087906108af565b6103bf565b6060600480546101f590610874565b3360008181526001602090815260408083206001600160a01b0387168452909152812054909190838110156103a45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760448201527f207a65726f00000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6102a982868684036103bf565b600033610286818585610575565b6001600160a01b0383166104215760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b606482015260840161039b565b6001600160a01b0382166104825760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b606482015260840161039b565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6001600160a01b03838116600090815260016020908152604080832093861683529290522054600019811461056f57818110156105625760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000604482015260640161039b565b61056f84848484036103bf565b50505050565b6001600160a01b0383166105f15760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f20616460448201527f6472657373000000000000000000000000000000000000000000000000000000606482015260840161039b565b6001600160a01b0382166106535760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b606482015260840161039b565b6001600160a01b038316600090815260208190526040902054818110156106e25760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e742065786365656473206260448201527f616c616e63650000000000000000000000000000000000000000000000000000606482015260840161039b565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a361056f565b600060208083528351808285015260005b8181101561077557858101830151858201604001528201610759565b81811115610787576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b03811681146107b457600080fd5b919050565b600080604083850312156107cc57600080fd5b6107d58361079d565b946020939093013593505050565b6000806000606084860312156107f857600080fd5b6108018461079d565b925061080f6020850161079d565b9150604084013590509250925092565b60006020828403121561083157600080fd5b61083a8261079d565b9392505050565b6000806040838503121561085457600080fd5b61085d8361079d565b915061086b6020840161079d565b90509250929050565b600181811c9082168061088857607f821691505b602082108114156108a957634e487b7160e01b600052602260045260246000fd5b50919050565b600082198211156108d057634e487b7160e01b600052601160045260246000fd5b50019056fea164736f6c6343000809000a",
+  "bytecode": "0x60e06040523480156200001157600080fd5b5060405162000e5138038062000e51833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610a86620003cb600039600061044501526000610410015260006101490152610a866000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806370a0823111610081578063a9059cbb1161005b578063a9059cbb146101cd578063d505accf146101e0578063dd62ed3e146101f557600080fd5b806370a08231146101855780637ecebe00146101a557806395d89b41146101c557600080fd5b806323b872dd116100b257806323b872dd14610131578063313ce567146101445780633644e5151461017d57600080fd5b806306fdde03146100d9578063095ea7b3146100f757806318160ddd1461011a575b600080fd5b6100e1610220565b6040516100ee91906107de565b60405180910390f35b61010a61010536600461084f565b6102ae565b60405190151581526020016100ee565b61012360025481565b6040519081526020016100ee565b61010a61013f366004610879565b61031a565b61016b7f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100ee565b61012361040c565b6101236101933660046108b5565b60036020526000908152604090205481565b6101236101b33660046108b5565b60056020526000908152604090205481565b6100e1610467565b61010a6101db36600461084f565b610474565b6101f36101ee3660046108d7565b6104ec565b005b61012361020336600461094a565b600460209081526000928352604080842090915290825290205481565b6000805461022d9061097d565b80601f01602080910402602001604051908101604052809291908181526020018280546102599061097d565b80156102a65780601f1061027b576101008083540402835291602001916102a6565b820191906000526020600020905b81548152906001019060200180831161028957829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103099086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103765761035183826109b8565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b0385166000908152600360205260408120805485929061039e9084906109b8565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103f99087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104425761043d610744565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461022d9061097d565b336000908152600360205260408120805483919083906104959084906109b8565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103099086815260200190565b428410156105415760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161054d61040c565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610659573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381161580159061068f5750876001600160a01b0316816001600160a01b0316145b6106db5760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610538565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f600060405161077691906109dd565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b600060208083528351808285015260005b8181101561080b578581018301518582016040015282016107ef565b8181111561081d576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461084a57600080fd5b919050565b6000806040838503121561086257600080fd5b61086b83610833565b946020939093013593505050565b60008060006060848603121561088e57600080fd5b61089784610833565b92506108a560208501610833565b9150604084013590509250925092565b6000602082840312156108c757600080fd5b6108d082610833565b9392505050565b600080600080600080600060e0888a0312156108f257600080fd5b6108fb88610833565b965061090960208901610833565b95506040880135945060608801359350608088013560ff8116811461092d57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b6000806040838503121561095d57600080fd5b61096683610833565b915061097460208401610833565b90509250929050565b600181811c9082168061099157607f821691505b602082108114156109b257634e487b7160e01b600052602260045260246000fd5b50919050565b6000828210156109d857634e487b7160e01b600052601160045260246000fd5b500390565b600080835481600182811c9150808316806109f957607f831692505b6020808410821415610a1957634e487b7160e01b86526022600452602486fd5b818015610a2d5760018114610a3e57610a6b565b60ff19861689528489019650610a6b565b60008a81526020902060005b86811015610a635781548b820152908501908301610a4a565b505084890196505b50949897505050505050505056fea164736f6c6343000809000a",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100d45760003560e01c806370a0823111610081578063a9059cbb1161005b578063a9059cbb146101cd578063d505accf146101e0578063dd62ed3e146101f557600080fd5b806370a08231146101855780637ecebe00146101a557806395d89b41146101c557600080fd5b806323b872dd116100b257806323b872dd14610131578063313ce567146101445780633644e5151461017d57600080fd5b806306fdde03146100d9578063095ea7b3146100f757806318160ddd1461011a575b600080fd5b6100e1610220565b6040516100ee91906107de565b60405180910390f35b61010a61010536600461084f565b6102ae565b60405190151581526020016100ee565b61012360025481565b6040519081526020016100ee565b61010a61013f366004610879565b61031a565b61016b7f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100ee565b61012361040c565b6101236101933660046108b5565b60036020526000908152604090205481565b6101236101b33660046108b5565b60056020526000908152604090205481565b6100e1610467565b61010a6101db36600461084f565b610474565b6101f36101ee3660046108d7565b6104ec565b005b61012361020336600461094a565b600460209081526000928352604080842090915290825290205481565b6000805461022d9061097d565b80601f01602080910402602001604051908101604052809291908181526020018280546102599061097d565b80156102a65780601f1061027b576101008083540402835291602001916102a6565b820191906000526020600020905b81548152906001019060200180831161028957829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103099086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103765761035183826109b8565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b0385166000908152600360205260408120805485929061039e9084906109b8565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103f99087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104425761043d610744565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461022d9061097d565b336000908152600360205260408120805483919083906104959084906109b8565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103099086815260200190565b428410156105415760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161054d61040c565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610659573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381161580159061068f5750876001600160a01b0316816001600160a01b0316145b6106db5760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610538565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f600060405161077691906109dd565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b600060208083528351808285015260005b8181101561080b578581018301518582016040015282016107ef565b8181111561081d576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461084a57600080fd5b919050565b6000806040838503121561086257600080fd5b61086b83610833565b946020939093013593505050565b60008060006060848603121561088e57600080fd5b61089784610833565b92506108a560208501610833565b9150604084013590509250925092565b6000602082840312156108c757600080fd5b6108d082610833565b9392505050565b600080600080600080600060e0888a0312156108f257600080fd5b6108fb88610833565b965061090960208901610833565b95506040880135945060608801359350608088013560ff8116811461092d57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b6000806040838503121561095d57600080fd5b61096683610833565b915061097460208401610833565b90509250929050565b600181811c9082168061099157607f821691505b602082108114156109b257634e487b7160e01b600052602260045260246000fd5b50919050565b6000828210156109d857634e487b7160e01b600052601160045260246000fd5b500390565b600080835481600182811c9150808316806109f957607f831692505b6020808410821415610a1957634e487b7160e01b86526022600452602486fd5b818015610a2d5760018114610a3e57610a6b565b60ff19861689528489019650610a6b565b60008a81526020902060005b86811015610a635781548b820152908501908301610a4a565b505084890196505b50949897505050505050505056fea164736f6c6343000809000a",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/src/utils/smart_contract_files/P2PIX.json b/src/utils/smart_contract_files/P2PIX.json
index aaeaabc..04d915b 100644
--- a/src/utils/smart_contract_files/P2PIX.json
+++ b/src/utils/smart_contract_files/P2PIX.json
@@ -16,9 +16,59 @@
           "type": "address[]"
         }
       ],
-      "stateMutability": "nonpayable",
+      "stateMutability": "payable",
       "type": "constructor"
     },
+    {
+      "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": "Reentrancy",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "TxAlreadyUsed",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -175,7 +225,7 @@
         {
           "indexed": true,
           "internalType": "address",
-          "name": "previousOwner",
+          "name": "user",
           "type": "address"
         },
         {
@@ -185,7 +235,7 @@
           "type": "address"
         }
       ],
-      "name": "OwnershipTransferred",
+      "name": "OwnerUpdated",
       "type": "event"
     },
     {
@@ -207,6 +257,25 @@
       "name": "PremiumsWithdrawn",
       "type": "event"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_addr",
+          "type": "address"
+        }
+      ],
+      "name": "_castAddrToKey",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "_key",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -268,7 +337,7 @@
       "outputs": [
         {
           "internalType": "uint256",
-          "name": "_value",
+          "name": "_val",
           "type": "uint256"
         }
       ],
@@ -279,27 +348,27 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "depositID",
+          "name": "_depositID",
           "type": "uint256"
         },
         {
           "internalType": "address",
-          "name": "targetAddress",
+          "name": "_targetAddress",
           "type": "address"
         },
         {
           "internalType": "address",
-          "name": "relayerAddress",
+          "name": "_relayerAddress",
           "type": "address"
         },
         {
           "internalType": "uint256",
-          "name": "relayerPremium",
+          "name": "_relayerPremium",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "amount",
+          "name": "_amount",
           "type": "uint256"
         },
         {
@@ -319,6 +388,94 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "mapDeposits",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "remaining",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "premium",
+          "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "pixTarget",
+          "type": "string"
+        },
+        {
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "valid",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "name": "mapLocks",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "depositID",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "relayerPremium",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "expirationBlock",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "targetAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "relayerAddress",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "owner",
@@ -365,13 +522,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -380,7 +530,7 @@
           "type": "address"
         }
       ],
-      "name": "transferOwnership",
+      "name": "setOwner",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -401,9 +551,9 @@
     {
       "inputs": [
         {
-          "internalType": "address",
+          "internalType": "uint256",
           "name": "",
-          "type": "address"
+          "type": "uint256"
         }
       ],
       "name": "validBacenSigners",
@@ -443,8 +593,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506040516200197238038062001972833981016040819052620000349162000145565b6200003f33620000c2565b600282905560005b81518160ff161015620000b957600160036000848460ff168151811062000072576200007262000225565b6020908102919091018101516001600160a01b03168252810191909152604001600020805460ff191691151591909117905580620000b0816200023b565b91505062000047565b5050506200026a565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b634e487b7160e01b600052604160045260246000fd5b80516001600160a01b03811681146200014057600080fd5b919050565b600080604083850312156200015957600080fd5b8251602080850151919350906001600160401b03808211156200017b57600080fd5b818601915086601f8301126200019057600080fd5b815181811115620001a557620001a562000112565b8060051b604051601f19603f83011681018181108582111715620001cd57620001cd62000112565b604052918252848201925083810185019189831115620001ec57600080fd5b938501935b828510156200021557620002058562000128565b84529385019392850192620001f1565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060ff821660ff8114156200026157634e487b7160e01b600052601160045260246000fd5b60010192915050565b6116f8806200027a6000396000f3fe6080604052600436106100d25760003560e01c806372fada5c1161007f5780639872dbfe116100595780639872dbfe146101f5578063b93bd7d41461020b578063bfe07da61461024b578063f2fde38b1461025e57600080fd5b806372fada5c1461018d5780638da5cb5b146101ad5780638e2749d6146101d557600080fd5b80634e1389ed116100b05780634e1389ed146101435780636193cdfb14610163578063715018a61461017857600080fd5b806303aaf306146100d75780632dfdf0b51461010a5780633631797214610121575b600080fd5b3480156100e357600080fd5b506100f76100f2366004611345565b61027e565b6040519081526020015b60405180910390f35b34801561011657600080fd5b506001546100f79081565b34801561012d57600080fd5b5061014161013c3660046113c7565b610573565b005b34801561014f57600080fd5b5061014161015e366004611413565b610701565b34801561016f57600080fd5b50610141610b7c565b34801561018457600080fd5b50610141610bf0565b34801561019957600080fd5b506101416101a8366004611466565b610c04565b3480156101b957600080fd5b506000546040516001600160a01b039091168152602001610101565b3480156101e157600080fd5b506101416101f036600461147f565b610ce0565b34801561020157600080fd5b506100f760025481565b34801561021757600080fd5b5061023b6102263660046114c1565b60036020526000908152604090205460ff1681565b6040519015158152602001610101565b6100f76102593660046114e3565b610e62565b34801561026a57600080fd5b506101416102793660046114c1565b6110fd565b600061028a8383610ce0565b60008881526004602081905260409091209081015460ff166102f35760405162461bcd60e51b815260206004820181905260248201527f50325049583a204465706f736974206e6f742076616c696420616e796d6f726560448201526064015b60405180910390fd5b848160020154101561036d5760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204e6f7420656e6f75676820746f6b656e2072656d61696e696e60448201527f67206f6e206465706f736974000000000000000000000000000000000000000060648201526084016102ea565b60408051602081018b9052908101869052606089811b6bffffffffffffffffffffffff1916908201526074016040516020818303038152906040528051906020012091504360056000848152602001908152602001600020600501541061043c5760405162461bcd60e51b815260206004820152603360248201527f50325049583a20416e6f74686572206c6f636b20776974682073616d6520494460448201527f206973206e6f742065787069726564207965740000000000000000000000000060648201526084016102ea565b60006040518060c001604052808b81526020018a6001600160a01b03168152602001896001600160a01b03168152602001888152602001878152602001600254436104879190611580565b9052600084815260056020818152604080842085518155918501516001830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915591860151600280850180549290931691909316179055606085015160038301556080850151600483015560a0850151919092015584018054929350889290919061051b908490611598565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a35050979650505050505050565b60008381526004602052604090205483906001600160a01b031633146105f05760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204f6e6c792073656c6c657220636f756c642063616c6c20746860448201526b34b990333ab731ba34b7b71760a11b60648201526084016102ea565b6105fa8383610ce0565b60008481526004602081905260409091209081015460ff16156106205761062085610c04565b60018101548154600283015460405163a9059cbb60e01b81526001600160a01b0392831660048201526024810191909152911690819063a9059cbb90604401602060405180830381600087803b15801561067957600080fd5b505af115801561068d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b191906115af565b506002820180546000909155604080518881526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505050505050565b60008581526005602081905260409091209081015443108015610728575060008160040154115b61079a5760405162461bcd60e51b815260206004820152602860248201527f50325049583a204c6f636b20616c72656164792072656c6561736564206f722060448201527f72657475726e656400000000000000000000000000000000000000000000000060648201526084016102ea565b805460009081526004602081815260408084209285015490519293926107c8926005860192918b910161160c565b60405160208183030381529060405280519060200120905060008160405160200161081f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600690935291205490915060ff16156108bd5760405162461bcd60e51b815260206004820152603160248201527f50325049583a205472616e73616374696f6e20616c726561647920757365642060448201527f746f20756e6c6f636b207061796d656e7400000000000000000000000000000060648201526084016102ea565b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905260019060a0016020604051602081039080840390855afa158015610911573d6000803e3d6000fd5b505060408051601f1901516001600160a01b03811660009081526003602052919091205490925060ff1690506109955760405162461bcd60e51b815260206004820152602360248201527f50325049583a205369676e6572206973206e6f7420612076616c6964207369676044820152623732b960e91b60648201526084016102ea565b60018085015490860154600387015460048801546001600160a01b0393841693849363a9059cbb939116916109ca9190611598565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610a2857600080fd5b505af1158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6091906115af565b50600386015415610afb576002860154600387015460405163a9059cbb60e01b81526001600160a01b03928316600482015260248101919091529082169063a9059cbb90604401602060405180830381600087803b158015610ac157600080fd5b505af1158015610ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af991906115af565b505b600060048701819055600587018190558481526006602052604090819020805460ff1916600190811790915587015490516001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d90610b67908e815260200190565b60405180910390a25050505050505050505050565b610b8461118d565b6040514790339082156108fc029083906000818181858888f19350505050158015610bb3573d6000803e3d6000fd5b5060408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b610bf861118d565b610c0260006111e7565b565b60008181526004602052604090205481906001600160a01b03163314610c815760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204f6e6c792073656c6c657220636f756c642063616c6c20746860448201526b34b990333ab731ba34b7b71760a11b60648201526084016102ea565b600082815260046020818152604092839020918201805460ff19169055905491518481526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a25050565b8060005b818161ffff161015610e5c5760006005600086868561ffff16818110610d0c57610d0c6116b3565b9050602002013581526020019081526020016000209050438160050154108015610d3a575060008160040154115b610dac5760405162461bcd60e51b815260206004820152602b60248201527f50325049583a204c6f636b206e6f742065787069726564206f7220616c72656160448201527f64792072656c656173656400000000000000000000000000000000000000000060648201526084016102ea565b806004015460046000836000015481526020019081526020016000206002016000828254610dda9190611580565b90915550506000600482015560018101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868661ffff8616818110610e2b57610e2b6116b3565b90506020020135604051610e4191815260200190565b60405180910390a25080610e54816116c9565b915050610ce4565b50505050565b6000610e6d60015490565b6000818152600460208190526040909120015490915060ff1615610ef95760405162461bcd60e51b815260206004820152603260248201527f50325049583a204465706f73697420616c726561647920657869737420616e6460448201527f206974206973207374696c6c2076616c6964000000000000000000000000000060648201526084016102ea565b6040516323b872dd60e01b81523360048201523060248201526044810185905285906001600160a01b038216906323b872dd90606401602060405180830381600087803b158015610f4957600080fd5b505af1158015610f5d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8191906115af565b5060006040518060c00160405280336001600160a01b03168152602001886001600160a01b0316815260200187815260200134815260200160011515815260200186868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525093909452505085815260046020818152604092839020855181546001600160a01b0391821673ffffffffffffffffffffffffffffffffffffffff1991821617835583880151600184018054919093169116179055928501516002840155606085015160038401556080850151918301805492151560ff199093169290921790915560a0840151805194955085949293506110979260058501929190910190611244565b5050600180548101905550604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b61110561118d565b6001600160a01b0381166111815760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016102ea565b61118a816111e7565b50565b6000546001600160a01b03163314610c025760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102ea565b600080546001600160a01b0383811673ffffffffffffffffffffffffffffffffffffffff19831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b828054611250906115d1565b90600052602060002090601f01602090048101928261127257600085556112b8565b82601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b5b808211156112c457600081556001016112c9565b80356001600160a01b03811681146112f457600080fd5b919050565b60008083601f84011261130b57600080fd5b50813567ffffffffffffffff81111561132357600080fd5b6020830191508360208260051b850101111561133e57600080fd5b9250929050565b600080600080600080600060c0888a03121561136057600080fd5b87359650611370602089016112dd565b955061137e604089016112dd565b9450606088013593506080880135925060a088013567ffffffffffffffff8111156113a857600080fd5b6113b48a828b016112f9565b989b979a50959850939692959293505050565b6000806000604084860312156113dc57600080fd5b83359250602084013567ffffffffffffffff8111156113fa57600080fd5b611406868287016112f9565b9497909650939450505050565b600080600080600060a0868803121561142b57600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461145857600080fd5b809150509295509295909350565b60006020828403121561147857600080fd5b5035919050565b6000806020838503121561149257600080fd5b823567ffffffffffffffff8111156114a957600080fd5b6114b5858286016112f9565b90969095509350505050565b6000602082840312156114d357600080fd5b6114dc826112dd565b9392505050565b600080600080606085870312156114f957600080fd5b611502856112dd565b935060208501359250604085013567ffffffffffffffff8082111561152657600080fd5b818701915087601f83011261153a57600080fd5b81358181111561154957600080fd5b88602082850101111561155b57600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156115935761159361156a565b500190565b6000828210156115aa576115aa61156a565b500390565b6000602082840312156115c157600080fd5b815180151581146114dc57600080fd5b600181811c908216806115e557607f821691505b6020821081141561160657634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061162857607f831692505b602080841082141561164857634e487b7160e01b86526022600452602486fd5b81801561165c576001811461166d5761169a565b60ff1986168952848901965061169a565b60008c81526020902060005b868110156116925781548b820152908501908301611679565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fd5b600061ffff808316818114156116e1576116e161156a565b600101939250505056fea164736f6c6343000809000a",
-  "deployedBytecode": "0x6080604052600436106100d25760003560e01c806372fada5c1161007f5780639872dbfe116100595780639872dbfe146101f5578063b93bd7d41461020b578063bfe07da61461024b578063f2fde38b1461025e57600080fd5b806372fada5c1461018d5780638da5cb5b146101ad5780638e2749d6146101d557600080fd5b80634e1389ed116100b05780634e1389ed146101435780636193cdfb14610163578063715018a61461017857600080fd5b806303aaf306146100d75780632dfdf0b51461010a5780633631797214610121575b600080fd5b3480156100e357600080fd5b506100f76100f2366004611345565b61027e565b6040519081526020015b60405180910390f35b34801561011657600080fd5b506001546100f79081565b34801561012d57600080fd5b5061014161013c3660046113c7565b610573565b005b34801561014f57600080fd5b5061014161015e366004611413565b610701565b34801561016f57600080fd5b50610141610b7c565b34801561018457600080fd5b50610141610bf0565b34801561019957600080fd5b506101416101a8366004611466565b610c04565b3480156101b957600080fd5b506000546040516001600160a01b039091168152602001610101565b3480156101e157600080fd5b506101416101f036600461147f565b610ce0565b34801561020157600080fd5b506100f760025481565b34801561021757600080fd5b5061023b6102263660046114c1565b60036020526000908152604090205460ff1681565b6040519015158152602001610101565b6100f76102593660046114e3565b610e62565b34801561026a57600080fd5b506101416102793660046114c1565b6110fd565b600061028a8383610ce0565b60008881526004602081905260409091209081015460ff166102f35760405162461bcd60e51b815260206004820181905260248201527f50325049583a204465706f736974206e6f742076616c696420616e796d6f726560448201526064015b60405180910390fd5b848160020154101561036d5760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204e6f7420656e6f75676820746f6b656e2072656d61696e696e60448201527f67206f6e206465706f736974000000000000000000000000000000000000000060648201526084016102ea565b60408051602081018b9052908101869052606089811b6bffffffffffffffffffffffff1916908201526074016040516020818303038152906040528051906020012091504360056000848152602001908152602001600020600501541061043c5760405162461bcd60e51b815260206004820152603360248201527f50325049583a20416e6f74686572206c6f636b20776974682073616d6520494460448201527f206973206e6f742065787069726564207965740000000000000000000000000060648201526084016102ea565b60006040518060c001604052808b81526020018a6001600160a01b03168152602001896001600160a01b03168152602001888152602001878152602001600254436104879190611580565b9052600084815260056020818152604080842085518155918501516001830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915591860151600280850180549290931691909316179055606085015160038301556080850151600483015560a0850151919092015584018054929350889290919061051b908490611598565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a35050979650505050505050565b60008381526004602052604090205483906001600160a01b031633146105f05760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204f6e6c792073656c6c657220636f756c642063616c6c20746860448201526b34b990333ab731ba34b7b71760a11b60648201526084016102ea565b6105fa8383610ce0565b60008481526004602081905260409091209081015460ff16156106205761062085610c04565b60018101548154600283015460405163a9059cbb60e01b81526001600160a01b0392831660048201526024810191909152911690819063a9059cbb90604401602060405180830381600087803b15801561067957600080fd5b505af115801561068d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b191906115af565b506002820180546000909155604080518881526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505050505050565b60008581526005602081905260409091209081015443108015610728575060008160040154115b61079a5760405162461bcd60e51b815260206004820152602860248201527f50325049583a204c6f636b20616c72656164792072656c6561736564206f722060448201527f72657475726e656400000000000000000000000000000000000000000000000060648201526084016102ea565b805460009081526004602081815260408084209285015490519293926107c8926005860192918b910161160c565b60405160208183030381529060405280519060200120905060008160405160200161081f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600690935291205490915060ff16156108bd5760405162461bcd60e51b815260206004820152603160248201527f50325049583a205472616e73616374696f6e20616c726561647920757365642060448201527f746f20756e6c6f636b207061796d656e7400000000000000000000000000000060648201526084016102ea565b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905260019060a0016020604051602081039080840390855afa158015610911573d6000803e3d6000fd5b505060408051601f1901516001600160a01b03811660009081526003602052919091205490925060ff1690506109955760405162461bcd60e51b815260206004820152602360248201527f50325049583a205369676e6572206973206e6f7420612076616c6964207369676044820152623732b960e91b60648201526084016102ea565b60018085015490860154600387015460048801546001600160a01b0393841693849363a9059cbb939116916109ca9190611598565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610a2857600080fd5b505af1158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6091906115af565b50600386015415610afb576002860154600387015460405163a9059cbb60e01b81526001600160a01b03928316600482015260248101919091529082169063a9059cbb90604401602060405180830381600087803b158015610ac157600080fd5b505af1158015610ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af991906115af565b505b600060048701819055600587018190558481526006602052604090819020805460ff1916600190811790915587015490516001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d90610b67908e815260200190565b60405180910390a25050505050505050505050565b610b8461118d565b6040514790339082156108fc029083906000818181858888f19350505050158015610bb3573d6000803e3d6000fd5b5060408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b610bf861118d565b610c0260006111e7565b565b60008181526004602052604090205481906001600160a01b03163314610c815760405162461bcd60e51b815260206004820152602c60248201527f50325049583a204f6e6c792073656c6c657220636f756c642063616c6c20746860448201526b34b990333ab731ba34b7b71760a11b60648201526084016102ea565b600082815260046020818152604092839020918201805460ff19169055905491518481526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a25050565b8060005b818161ffff161015610e5c5760006005600086868561ffff16818110610d0c57610d0c6116b3565b9050602002013581526020019081526020016000209050438160050154108015610d3a575060008160040154115b610dac5760405162461bcd60e51b815260206004820152602b60248201527f50325049583a204c6f636b206e6f742065787069726564206f7220616c72656160448201527f64792072656c656173656400000000000000000000000000000000000000000060648201526084016102ea565b806004015460046000836000015481526020019081526020016000206002016000828254610dda9190611580565b90915550506000600482015560018101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868661ffff8616818110610e2b57610e2b6116b3565b90506020020135604051610e4191815260200190565b60405180910390a25080610e54816116c9565b915050610ce4565b50505050565b6000610e6d60015490565b6000818152600460208190526040909120015490915060ff1615610ef95760405162461bcd60e51b815260206004820152603260248201527f50325049583a204465706f73697420616c726561647920657869737420616e6460448201527f206974206973207374696c6c2076616c6964000000000000000000000000000060648201526084016102ea565b6040516323b872dd60e01b81523360048201523060248201526044810185905285906001600160a01b038216906323b872dd90606401602060405180830381600087803b158015610f4957600080fd5b505af1158015610f5d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8191906115af565b5060006040518060c00160405280336001600160a01b03168152602001886001600160a01b0316815260200187815260200134815260200160011515815260200186868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525093909452505085815260046020818152604092839020855181546001600160a01b0391821673ffffffffffffffffffffffffffffffffffffffff1991821617835583880151600184018054919093169116179055928501516002840155606085015160038401556080850151918301805492151560ff199093169290921790915560a0840151805194955085949293506110979260058501929190910190611244565b5050600180548101905550604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b61110561118d565b6001600160a01b0381166111815760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016102ea565b61118a816111e7565b50565b6000546001600160a01b03163314610c025760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102ea565b600080546001600160a01b0383811673ffffffffffffffffffffffffffffffffffffffff19831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b828054611250906115d1565b90600052602060002090601f01602090048101928261127257600085556112b8565b82601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b5b808211156112c457600081556001016112c9565b80356001600160a01b03811681146112f457600080fd5b919050565b60008083601f84011261130b57600080fd5b50813567ffffffffffffffff81111561132357600080fd5b6020830191508360208260051b850101111561133e57600080fd5b9250929050565b600080600080600080600060c0888a03121561136057600080fd5b87359650611370602089016112dd565b955061137e604089016112dd565b9450606088013593506080880135925060a088013567ffffffffffffffff8111156113a857600080fd5b6113b48a828b016112f9565b989b979a50959850939692959293505050565b6000806000604084860312156113dc57600080fd5b83359250602084013567ffffffffffffffff8111156113fa57600080fd5b611406868287016112f9565b9497909650939450505050565b600080600080600060a0868803121561142b57600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461145857600080fd5b809150509295509295909350565b60006020828403121561147857600080fd5b5035919050565b6000806020838503121561149257600080fd5b823567ffffffffffffffff8111156114a957600080fd5b6114b5858286016112f9565b90969095509350505050565b6000602082840312156114d357600080fd5b6114dc826112dd565b9392505050565b600080600080606085870312156114f957600080fd5b611502856112dd565b935060208501359250604085013567ffffffffffffffff8082111561152657600080fd5b818701915087601f83011261153a57600080fd5b81358181111561154957600080fd5b88602082850101111561155b57600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156115935761159361156a565b500190565b6000828210156115aa576115aa61156a565b500390565b6000602082840312156115c157600080fd5b815180151581146114dc57600080fd5b600181811c908216806115e557607f821691505b6020821081141561160657634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061162857607f831692505b602080841082141561164857634e487b7160e01b86526022600452602486fd5b81801561165c576001811461166d5761169a565b60ff1986168952848901965061169a565b60008c81526020902060005b868110156116925781548b820152908501908301611679565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fd5b600061ffff808316818114156116e1576116e161156a565b600101939250505056fea164736f6c6343000809000a",
+  "bytecode": "0x60806040526001805560405162001806380380620018068339810160408190526200002a9162000123565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a350600382905580516000905b80821015620000d6576000620000ae8484815181106200009a576200009a62000203565b6020026020010151620000e060201b60201c565b6000908152600460205260409020805460ff1916600190811790915592909201915062000076565b5050505062000219565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b80516001600160a01b03811681146200011e57600080fd5b919050565b600080604083850312156200013757600080fd5b8251602080850151919350906001600160401b03808211156200015957600080fd5b818601915086601f8301126200016e57600080fd5b815181811115620001835762000183620000f0565b8060051b604051601f19603f83011681018181108582111715620001ab57620001ab620000f0565b604052918252848201925083810185019189831115620001ca57600080fd5b938501935b82851015620001f357620001e38562000106565b84529385019392850192620001cf565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6115dd80620002296000396000f3fe6080604052600436106100e85760003560e01c80636193cdfb1161008a5780638e2a3d36116100595780638e2a3d36146102f55780639872dbfe1461032757806398a268711461033d578063bfe07da61461037d57600080fd5b80636193cdfb1461026857806372fada5c1461027d5780638da5cb5b1461029d5780638e2749d6146102d557600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101d857806336317972146101ef5780634b2ae9801461020f5780634e1389ed1461024857600080fd5b806303aaf306146100ed57806313af40351461012057806316d7224014610142575b600080fd5b3480156100f957600080fd5b5061010d6101083660046111e7565b610390565b6040519081526020015b60405180910390f35b34801561012c57600080fd5b5061014061013b366004611269565b61053a565b005b34801561014e57600080fd5b5061019f61015d366004611284565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610117565b3480156101e457600080fd5b5060025461010d9081565b3480156101fb57600080fd5b5061014061020a36600461129d565b6105e0565b34801561021b57600080fd5b5061010d61022a366004611269565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025457600080fd5b506101406102633660046112e9565b6106a0565b34801561027457600080fd5b50610140610962565b34801561028957600080fd5b50610140610298366004611284565b6109f2565b3480156102a957600080fd5b506000546102bd906001600160a01b031681565b6040516001600160a01b039091168152602001610117565b3480156102e157600080fd5b506101406102f036600461133c565b610a7a565b34801561030157600080fd5b50610315610310366004611284565b610b76565b6040516101179695949392919061137e565b34801561033357600080fd5b5061010d60035481565b34801561034957600080fd5b5061036d610358366004611284565b60046020526000908152604090205460ff1681565b6040519015158152602001610117565b61010d61038b36600461140c565b610c46565b600061039a610e00565b6103a48383610a7a565b60008881526005602052604090206004810154600160a01b900460ff166103de57604051635972996f60e11b815260040160405180910390fd5b8054851115610400576040516308aeed0f60e21b815260040160405180910390fd5b61040b89868a610e2b565b915060006040518060c001604052808b81526020018881526020018781526020016003544361043a91906114a9565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104d99084906114c1565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061052f60018055565b979650505050505050565b6000546001600160a01b031633146105885760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105e8610e00565b6105f183610eaf565b6105fb8282610a7a565b60008381526005602052604090206004810154600160a01b900460ff1615156001141561062b5761062b846109f2565b600481015481546000835560038301546001600160a01b03928316926106549184911683610eec565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505061069b60018055565b505050565b6106a8610e00565b6000858152600660205260409020600381015443108015906106cc57506002810154155b156106ea576040516331da482760e11b815260040160405180910390fd5b80546000908152600560209081526040808320600280860154925191949361071893918601928b9101611513565b60405160208183030381529060405280519060200120905060008160405160200161076f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107bd57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905261083f9060019060a0016020604051602081039080840390855afa158015610815573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661087157604051632057875960e21b815260040160405180910390fd5b6004840154600186015460028701546001600160a01b0390921691600091610898916114c1565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108dc9083906001600160a01b031683610eec565b60018701541561090757600587015460018801546109079184916001600160a01b0390911690610eec565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061095b60018055565b5050505050565b6000546001600160a01b031633146109ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b604482015260640161057f565b476109b63382610f78565b60408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b6109fb81610eaf565b6000818152600560209081526040918290206004810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556003015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b5a57600060066000868686818110610a9e57610a9e6115ba565b9050602002013581526020019081526020016000209050610abe81610fd3565b6002810154815460009081526005602052604081208054909190610ae39084906114a9565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b3057610b306115ba565b90506020020135604051610b4691815260200190565b60405180910390a282600101925050610a7e565b80821015610b705763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182015460028301805492939192610b9e906114d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610bca906114d8565b8015610c175780601f10610bec57610100808354040283529160200191610c17565b820191906000526020600020905b815481529060010190602001808311610bfa57829003601f168201915b50505050600383015460049093015491926001600160a01b03908116929081169150600160a01b900460ff1686565b6000610c50611006565b9050600085905060006040518060c0016040528087815260200134815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cd0610e00565b60008381526005602090815260409182902083518155818401516001820155918301518051849392610d099260028501929101906110e6565b50606082015160038201805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392831617905560808301516004909201805460a090940151929091167fffffffffffffffffffffff00000000000000000000000000000000000000000090931692909217600160a01b91151591909102179055600280546001019055610d9c82333089611056565b610da560018055565b604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b60015460021415610e245760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610ea85760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600301546001600160a01b03163314610ee9576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b705760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c45440000000000000000000000000000000000604482015260640161057f565b600080600080600085875af190508061069b5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c454400000000000000000000000000604482015260640161057f565b438160030154101580610fe857506002810154155b15610ee95760405163d0404f8560e01b815260040160405180910390fd5b600061101160025490565b600081815260056020526040902060040154909150600160a01b900460ff161515600114156110535760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061095b5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c4544000000000000000000000000604482015260640161057f565b8280546110f2906114d8565b90600052602060002090601f016020900481019282611114576000855561115a565b82601f1061112d57805160ff191683800117855561115a565b8280016001018555821561115a579182015b8281111561115a57825182559160200191906001019061113f565b5061116692915061116a565b5090565b5b80821115611166576000815560010161116b565b80356001600160a01b038116811461119657600080fd5b919050565b60008083601f8401126111ad57600080fd5b50813567ffffffffffffffff8111156111c557600080fd5b6020830191508360208260051b85010111156111e057600080fd5b9250929050565b600080600080600080600060c0888a03121561120257600080fd5b873596506112126020890161117f565b95506112206040890161117f565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124a57600080fd5b6112568a828b0161119b565b989b979a50959850939692959293505050565b60006020828403121561127b57600080fd5b610ea88261117f565b60006020828403121561129657600080fd5b5035919050565b6000806000604084860312156112b257600080fd5b83359250602084013567ffffffffffffffff8111156112d057600080fd5b6112dc8682870161119b565b9497909650939450505050565b600080600080600060a0868803121561130157600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461132e57600080fd5b809150509295509295909350565b6000806020838503121561134f57600080fd5b823567ffffffffffffffff81111561136657600080fd5b6113728582860161119b565b90969095509350505050565b86815260006020878184015260c0604084015286518060c085015260005b818110156113b85788810183015185820160e00152820161139c565b818111156113ca57600060e083870101525b50601f01601f1916830160e00191506113f0905060608301866001600160a01b03169052565b6001600160a01b038416608083015282151560a083015261052f565b6000806000806060858703121561142257600080fd5b61142b8561117f565b935060208501359250604085013567ffffffffffffffff8082111561144f57600080fd5b818701915087601f83011261146357600080fd5b81358181111561147257600080fd5b88602082850101111561148457600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bc576114bc611493565b500190565b6000828210156114d3576114d3611493565b500390565b600181811c908216806114ec57607f821691505b6020821081141561150d57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061152f57607f831692505b602080841082141561154f57634e487b7160e01b86526022600452602486fd5b8180156115635760018114611574576115a1565b60ff198616895284890196506115a1565b60008c81526020902060005b868110156115995781548b820152908501908301611580565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
+  "deployedBytecode": "0x6080604052600436106100e85760003560e01c80636193cdfb1161008a5780638e2a3d36116100595780638e2a3d36146102f55780639872dbfe1461032757806398a268711461033d578063bfe07da61461037d57600080fd5b80636193cdfb1461026857806372fada5c1461027d5780638da5cb5b1461029d5780638e2749d6146102d557600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101d857806336317972146101ef5780634b2ae9801461020f5780634e1389ed1461024857600080fd5b806303aaf306146100ed57806313af40351461012057806316d7224014610142575b600080fd5b3480156100f957600080fd5b5061010d6101083660046111e7565b610390565b6040519081526020015b60405180910390f35b34801561012c57600080fd5b5061014061013b366004611269565b61053a565b005b34801561014e57600080fd5b5061019f61015d366004611284565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610117565b3480156101e457600080fd5b5060025461010d9081565b3480156101fb57600080fd5b5061014061020a36600461129d565b6105e0565b34801561021b57600080fd5b5061010d61022a366004611269565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025457600080fd5b506101406102633660046112e9565b6106a0565b34801561027457600080fd5b50610140610962565b34801561028957600080fd5b50610140610298366004611284565b6109f2565b3480156102a957600080fd5b506000546102bd906001600160a01b031681565b6040516001600160a01b039091168152602001610117565b3480156102e157600080fd5b506101406102f036600461133c565b610a7a565b34801561030157600080fd5b50610315610310366004611284565b610b76565b6040516101179695949392919061137e565b34801561033357600080fd5b5061010d60035481565b34801561034957600080fd5b5061036d610358366004611284565b60046020526000908152604090205460ff1681565b6040519015158152602001610117565b61010d61038b36600461140c565b610c46565b600061039a610e00565b6103a48383610a7a565b60008881526005602052604090206004810154600160a01b900460ff166103de57604051635972996f60e11b815260040160405180910390fd5b8054851115610400576040516308aeed0f60e21b815260040160405180910390fd5b61040b89868a610e2b565b915060006040518060c001604052808b81526020018881526020018781526020016003544361043a91906114a9565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104d99084906114c1565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061052f60018055565b979650505050505050565b6000546001600160a01b031633146105885760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105e8610e00565b6105f183610eaf565b6105fb8282610a7a565b60008381526005602052604090206004810154600160a01b900460ff1615156001141561062b5761062b846109f2565b600481015481546000835560038301546001600160a01b03928316926106549184911683610eec565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505061069b60018055565b505050565b6106a8610e00565b6000858152600660205260409020600381015443108015906106cc57506002810154155b156106ea576040516331da482760e11b815260040160405180910390fd5b80546000908152600560209081526040808320600280860154925191949361071893918601928b9101611513565b60405160208183030381529060405280519060200120905060008160405160200161076f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107bd57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905261083f9060019060a0016020604051602081039080840390855afa158015610815573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661087157604051632057875960e21b815260040160405180910390fd5b6004840154600186015460028701546001600160a01b0390921691600091610898916114c1565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108dc9083906001600160a01b031683610eec565b60018701541561090757600587015460018801546109079184916001600160a01b0390911690610eec565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061095b60018055565b5050505050565b6000546001600160a01b031633146109ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b604482015260640161057f565b476109b63382610f78565b60408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b6109fb81610eaf565b6000818152600560209081526040918290206004810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556003015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b5a57600060066000868686818110610a9e57610a9e6115ba565b9050602002013581526020019081526020016000209050610abe81610fd3565b6002810154815460009081526005602052604081208054909190610ae39084906114a9565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b3057610b306115ba565b90506020020135604051610b4691815260200190565b60405180910390a282600101925050610a7e565b80821015610b705763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182015460028301805492939192610b9e906114d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610bca906114d8565b8015610c175780601f10610bec57610100808354040283529160200191610c17565b820191906000526020600020905b815481529060010190602001808311610bfa57829003601f168201915b50505050600383015460049093015491926001600160a01b03908116929081169150600160a01b900460ff1686565b6000610c50611006565b9050600085905060006040518060c0016040528087815260200134815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cd0610e00565b60008381526005602090815260409182902083518155818401516001820155918301518051849392610d099260028501929101906110e6565b50606082015160038201805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392831617905560808301516004909201805460a090940151929091167fffffffffffffffffffffff00000000000000000000000000000000000000000090931692909217600160a01b91151591909102179055600280546001019055610d9c82333089611056565b610da560018055565b604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b60015460021415610e245760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610ea85760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600301546001600160a01b03163314610ee9576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b705760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c45440000000000000000000000000000000000604482015260640161057f565b600080600080600085875af190508061069b5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c454400000000000000000000000000604482015260640161057f565b438160030154101580610fe857506002810154155b15610ee95760405163d0404f8560e01b815260040160405180910390fd5b600061101160025490565b600081815260056020526040902060040154909150600160a01b900460ff161515600114156110535760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061095b5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c4544000000000000000000000000604482015260640161057f565b8280546110f2906114d8565b90600052602060002090601f016020900481019282611114576000855561115a565b82601f1061112d57805160ff191683800117855561115a565b8280016001018555821561115a579182015b8281111561115a57825182559160200191906001019061113f565b5061116692915061116a565b5090565b5b80821115611166576000815560010161116b565b80356001600160a01b038116811461119657600080fd5b919050565b60008083601f8401126111ad57600080fd5b50813567ffffffffffffffff8111156111c557600080fd5b6020830191508360208260051b85010111156111e057600080fd5b9250929050565b600080600080600080600060c0888a03121561120257600080fd5b873596506112126020890161117f565b95506112206040890161117f565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124a57600080fd5b6112568a828b0161119b565b989b979a50959850939692959293505050565b60006020828403121561127b57600080fd5b610ea88261117f565b60006020828403121561129657600080fd5b5035919050565b6000806000604084860312156112b257600080fd5b83359250602084013567ffffffffffffffff8111156112d057600080fd5b6112dc8682870161119b565b9497909650939450505050565b600080600080600060a0868803121561130157600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461132e57600080fd5b809150509295509295909350565b6000806020838503121561134f57600080fd5b823567ffffffffffffffff81111561136657600080fd5b6113728582860161119b565b90969095509350505050565b86815260006020878184015260c0604084015286518060c085015260005b818110156113b85788810183015185820160e00152820161139c565b818111156113ca57600060e083870101525b50601f01601f1916830160e00191506113f0905060608301866001600160a01b03169052565b6001600160a01b038416608083015282151560a083015261052f565b6000806000806060858703121561142257600080fd5b61142b8561117f565b935060208501359250604085013567ffffffffffffffff8082111561144f57600080fd5b818701915087601f83011261146357600080fd5b81358181111561147257600080fd5b88602082850101111561148457600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bc576114bc611493565b500190565b6000828210156114d3576114d3611493565b500390565b600181811c908216806114ec57607f821691505b6020821081141561150d57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061152f57607f831692505b602080841082141561154f57634e487b7160e01b86526022600452602486fd5b8180156115635760018114611574576115a1565b60ff198616895284890196506115a1565b60008c81526020902060005b868110156115995781548b820152908501908301611580565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/src/utils/smart_contract_files/wallets.json b/src/utils/smart_contract_files/wallets.json
index 3dd7eb2..5d6729c 100644
--- a/src/utils/smart_contract_files/wallets.json
+++ b/src/utils/smart_contract_files/wallets.json
@@ -1,8 +1,6 @@
 {
     "wallets":[
         "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-        "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-        "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
-        "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65"
+        "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC"
     ]
 }
\ No newline at end of file
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
index 594a4ac..c2ba80f 100644
--- a/src/views/MockView.vue
+++ b/src/views/MockView.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
+import type { BigNumber } from "ethers";
 import { storeToRefs } from "pinia";
+import { ref } from "vue";
 import { useEtherStore } from "../store/ether";
 import blockchain from "../utils/blockchain";
 
@@ -7,12 +9,16 @@ const etherStore = useEtherStore();
 
 const { walletAddress, balance, depositList } = storeToRefs(etherStore);
 
+const depositValue = ref<Number>();
+const depositPixKey = ref<string>("");
+
 const splitTokens = () => {
   blockchain.splitTokens();
 };
 
 const mockDeposit = () => {
-  blockchain.mockDeposit();
+  if(!depositValue.value || !depositPixKey.value) return;
+  blockchain.mockDeposit(depositValue.value.toString(), depositPixKey.value);
 };
 
 const countDeposit = () => {
@@ -29,6 +35,10 @@ const formatWalletAddress = (): string => {
   return `${initialText} ... ${finalText}`;
 };
 
+const mapDeposit = (depositId: BigNumber) => {
+  blockchain.mapDeposits(depositId)
+}
+
 const formatWalletBalance = (): string => {
   const formattedBalance = blockchain.formatEther(balance.value);
   const fixed = formattedBalance.substring(0, 8);
@@ -39,47 +49,77 @@ const formatWalletBalance = (): string => {
 
 <template>
   
-    <div class="flex gap-4 items-center">
+  <div class="page">
 
+    <div class="flex flex-col gap-4 justify-start items-start w-2/3">
       <button 
         type="button" 
-        class="p-2 rounded text-gray-50"
+        class="default-button"
         @click="countDeposit()"
       >
         Contar depósitos
       </button>
 
-      <button 
-        type="button" 
-        class="p-2 rounded text-gray-50"
-        @click="mockDeposit()"
-      >
-        Mockar depósitos
-      </button>
+      <div class="flex gap-4 w-full justify-between">
+        <input
+          type="number"
+          class="default-input"
+          placeholder="Quantidade de tokens"
+          v-model="depositValue"
+        />
+
+        <input
+          type="text"
+          class="default-input"
+          placeholder="Chave pix"
+          v-model="depositPixKey"
+        />
+        
+        <button 
+          type="button" 
+          class="default-button"
+          @click="mockDeposit()"
+        >
+          Mockar depósitos
+        </button>
+      </div>
 
       <button 
         type="button" 
-        class="p-2 rounded text-gray-50"
+        class="default-button"
         @click="splitTokens()"
       >
         Dividir tokens
       </button>
-
     </div>
 
-    <br>
-    <br>
-    <br>
-    <ul>
-      <center>
-        <li v-for="deposit in depositList" :key="deposit['blockNumber']">{{deposit['args']['0']}} : MRBZ {{blockchain.formatEther(deposit['args']['amount'])}} </li>
-      </center>
+    <ul class="flex flex-col justify-center items-center gap-4">
+      <li class="text-gray-900 font-semibold text-lg cursor-pointer border-2 border-amber-400 p-2 rounded-md bg-amber-200"  v-for="deposit in depositList" :key="deposit['blockNumber']" @click="mapDeposit(deposit['args']['depositID'])">{{deposit['args']['0']}} : MRBZ {{blockchain.formatEther(deposit['args']['amount'])}} </li>
     </ul>
-
+  </div>
 </template>
 
 <style scoped>
 header {
   @apply flex flex-row justify-between w-full items-center;
 }
+
+.default-button{
+  @apply p-2 rounded border-2 border-amber-400 text-gray-50 font-extrabold text-base w-full
+}
+
+.default-input{
+  @apply border-none outline-none text-lg text-gray-900 w-64 p-2 rounded-lg
+}
+
+.page{
+  @apply flex gap-8 mt-24
+}
+
+@media (max-width: 1024px) {
+  .page {
+    @apply flex-wrap
+  }
+}
+
 </style>

From 7f7d3dfae8d057c1e39ddea9681ff67e8dc9026a Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Fri, 25 Nov 2022 17:05:21 -0300
Subject: [PATCH 07/20] add validations to search tokens form, also implemented
 core functions

Co-authored-by: brunoedcf <brest.dallacosta@outlook.com>
Co-authored-by: Esio Freitas <esio.gustavo@gmail.com>
---
 src/store/ether.ts      |  4 ++--
 src/utils/blockchain.ts |  8 +++++--
 src/utils/debounce.ts   |  9 ++++++++
 src/views/HomeView.vue  | 50 +++++++++++++++++++++++++++++++++--------
 4 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 src/utils/debounce.ts

diff --git a/src/store/ether.ts b/src/store/ether.ts
index 0afd6ff..3a5b62b 100644
--- a/src/store/ether.ts
+++ b/src/store/ether.ts
@@ -4,7 +4,7 @@ export const useEtherStore = defineStore("ether", {
   state: () => ({
     walletAddress: "",
     balance: "",
-    depositList: {},
+    depositList: [{}],
   }),
   actions: {
     setWalletAddress(walletAddress: string) {
@@ -13,7 +13,7 @@ export const useEtherStore = defineStore("ether", {
     setBalance(balance: string) {
       this.balance = balance;
     },
-    setDepositList(depositList: {}) {
+    setDepositList(depositList: any[]) {
       this.depositList = depositList;
     },
   },
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 1942a9d..7421133 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -45,7 +45,6 @@ const connectProvider = async () => {
   const events = await p2pContract.queryFilter(filter);
 
   console.log(events)
-
   etherStore.setDepositList(events);
 
   connection.on("accountsChanged", (accounts: string[]) => {
@@ -129,6 +128,11 @@ const formatEther = (balance: string) => {
   return formatted;
 };
 
+const verifyDepositAmmount = (ammountBigNumber: BigNumber) => {
+  return ethers.utils.formatEther(ammountBigNumber)
+}
+
+
 const getProvider = (): ethers.providers.Web3Provider | null => {
   const window_ = window as any;
   const connection = window_.ethereum;
@@ -138,4 +142,4 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
   return new ethers.providers.Web3Provider(connection);
 };
 
-export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit, mapDeposits };
+export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit, mapDeposits, verifyDepositAmmount };
diff --git a/src/utils/debounce.ts b/src/utils/debounce.ts
new file mode 100644
index 0000000..2079277
--- /dev/null
+++ b/src/utils/debounce.ts
@@ -0,0 +1,9 @@
+export const debounce = (func: any, delay: number) => {
+    let timer: any = null
+    return function (this: unknown, ...args: any) {
+      clearTimeout(timer)
+      timer = setTimeout(() => {
+        func.apply(this, args)
+      }, delay) 
+    }
+  }
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index bed7337..d747b6a 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,11 +1,43 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import CustomButton from "../components/CustomButton.vue";
+import { debounce } from "@/utils/debounce";
+import { ethers } from "ethers";
+import { useEtherStore } from "@/store/ether";
+import { storeToRefs } from "pinia";
+import blockchain from "../utils/blockchain";
+
+const TAX_CONVERSION = 1.005
+const etherStore = useEtherStore();
+
+const { depositList } = storeToRefs(etherStore);
+
 const searchClick = () => {
-  console.log(value);
+  console.log("pass the deposit and token value ammount to next screen")
 };
 
-const value = ref<Number>()
+const valueConversion = (event: any) => {
+  const { value } = event.target
+
+  valueToToken.value =  Number(value) / TAX_CONVERSION
+
+  enableSelectButton.value = false;
+  selectedDeposit.value = null;
+
+  depositList.value.forEach((deposit) => {
+    const p2pixTokenValue = blockchain.verifyDepositAmmount(deposit.args.amount);
+
+    if(valueToToken.value!! <= Number(p2pixTokenValue)){
+      enableSelectButton.value = true;
+      selectedDeposit.value = deposit
+      return;
+    }
+  })
+}
+
+const valueToToken = ref<Number>(0);
+const enableSelectButton = ref(false);
+const selectedDeposit = ref();
 </script>
 
 <template>
@@ -23,17 +55,17 @@ const value = ref<Number>()
       class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
     >
       <div
-        class="flex justify-between w-full bg-white px-10 py-5 rounded-lg border-y-10 relative gap-1"
+        class="flex justify-between w-full bg-white px-8 py-5 rounded-lg border-y-10 relative gap-2"
       >
-        <p class="text-xl font-normal text-gray-900 mr-1" v-if="value != undefined && value.toString() != ''">R$</p>
+        <p class="text-xl font-normal text-gray-900" v-if="valueToToken != undefined && valueToToken != 0">R$</p>
         <input
           type="number"
           class="border-none outline-none text-lg text-gray-900 w-full"
-          v-bind:class="{ 'font-semibold': value != undefined, 'text-xl': value != undefined}"
+          v-bind:class="{ 'font-semibold': valueToToken != undefined, 'text-xl': valueToToken != undefined}"
           placeholder="Digite o valor que deseja pagar"
-          v-model="value"
+          @input="debounce(valueConversion, 500)($event)"
         />
-        <p class="text-xl font-normal text-gray-900" v-if="value == undefined || value.toString() == ''">R$</p>
+        <p class="text-xl font-normal text-gray-900" v-if="valueToToken == undefined || valueToToken == 0">R$</p>
       </div>
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
@@ -45,7 +77,7 @@ const value = ref<Number>()
         </div>
 
         <div class="flex justify-between w-full items-center">
-          <p class="text-3xl text-gray-900">0</p>
+          <p class="text-3xl text-gray-900">{{valueToToken.toFixed(3)}}</p>
           <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
             <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
             <p class="text-gray-900 text-lg">BRZ</p>
@@ -63,7 +95,7 @@ const value = ref<Number>()
       </div>
       <CustomButton
         :text="'Selecionar Oferta'"
-        :is-disabled="false"
+        :is-disabled="!enableSelectButton"
         @clicked="searchClick()"
       />
     </div>

From 1a281dc4297037e442c59e20a2e05a4979dbba0e Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Fri, 25 Nov 2022 19:17:38 -0300
Subject: [PATCH 08/20] add label when don't havee sufficient ammount token
 liquidity

---
 src/utils/blockchain.ts |  2 +-
 src/views/HomeView.vue  | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 7421133..6fd4214 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -128,7 +128,7 @@ const formatEther = (balance: string) => {
   return formatted;
 };
 
-const verifyDepositAmmount = (ammountBigNumber: BigNumber) => {
+const verifyDepositAmmount = (ammountBigNumber: BigNumber): string => {
   return ethers.utils.formatEther(ammountBigNumber)
 }
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index d747b6a..9fde481 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -16,6 +16,11 @@ const searchClick = () => {
   console.log("pass the deposit and token value ammount to next screen")
 };
 
+const valueToToken = ref<Number>(0);
+const enableSelectButton = ref(false);
+const hasLiquidity = ref(true);
+const selectedDeposit = ref();
+
 const valueConversion = (event: any) => {
   const { value } = event.target
 
@@ -27,17 +32,18 @@ const valueConversion = (event: any) => {
   depositList.value.forEach((deposit) => {
     const p2pixTokenValue = blockchain.verifyDepositAmmount(deposit.args.amount);
 
-    if(valueToToken.value!! <= Number(p2pixTokenValue)){
+    if(valueToToken.value!! <= Number(p2pixTokenValue) && valueToToken.value!! != 0){
       enableSelectButton.value = true;
-      selectedDeposit.value = deposit
+      hasLiquidity.value = true;
+      selectedDeposit.value = deposit;
       return;
     }
   })
-}
 
-const valueToToken = ref<Number>(0);
-const enableSelectButton = ref(false);
-const selectedDeposit = ref();
+  if(!enableSelectButton.value){
+    hasLiquidity.value = false
+  }
+}
 </script>
 
 <template>
@@ -64,6 +70,7 @@ const selectedDeposit = ref();
           v-bind:class="{ 'font-semibold': valueToToken != undefined, 'text-xl': valueToToken != undefined}"
           placeholder="Digite o valor que deseja pagar"
           @input="debounce(valueConversion, 500)($event)"
+          step=".01"
         />
         <p class="text-xl font-normal text-gray-900" v-if="valueToToken == undefined || valueToToken == 0">R$</p>
       </div>
@@ -85,13 +92,16 @@ const selectedDeposit = ref();
         </div>
 
         <div class="custom-divide py-2"></div>
-        <div class="flex justify-between pt-2">
+        <div class="flex justify-between pt-2" v-if="hasLiquidity">
           <p class="text-gray-500 font-normal text-sm  w-fit">~ ETH 0,00 (+0,121%)</p>
           <div class="flex gap-2">
             <img alt="Polygon image" src="@/assets/polygon.svg" width="24px" height="24px"/>
             <img alt="Ethereum image" src="@/assets/ethereum.svg" width="24px" height="24px"/>
           </div>
         </div>
+        <div class="flex pt-2 justify-center" v-if="!hasLiquidity">
+          <span class="text-red-500 font-normal text-sm">Atualmente não há liquidez nas redes para sua demanda</span>
+        </div>
       </div>
       <CustomButton
         :text="'Selecionar Oferta'"

From f47f711bd92cdc946741b6a842b38ba67a931a81 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Fri, 25 Nov 2022 19:30:54 -0300
Subject: [PATCH 09/20] transform the view implementation into a component
 called SearchComponent

---
 src/components/SearchComponent.vue | 146 +++++++++++++++++++++++++++++
 src/views/HomeView.vue             | 139 +--------------------------
 2 files changed, 148 insertions(+), 137 deletions(-)
 create mode 100644 src/components/SearchComponent.vue

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
new file mode 100644
index 0000000..5d8b01a
--- /dev/null
+++ b/src/components/SearchComponent.vue
@@ -0,0 +1,146 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import CustomButton from "../components/CustomButton.vue";
+import { debounce } from "@/utils/debounce";
+import { ethers } from "ethers";
+import { useEtherStore } from "@/store/ether";
+import { storeToRefs } from "pinia";
+import blockchain from "../utils/blockchain";
+
+const TAX_CONVERSION = 1.005
+const etherStore = useEtherStore();
+
+const { depositList } = storeToRefs(etherStore);
+
+const searchClick = () => {
+  console.log("pass the deposit and token value ammount to next screen")
+};
+
+const valueToToken = ref<Number>(0);
+const enableSelectButton = ref(false);
+const hasLiquidity = ref(true);
+const selectedDeposit = ref();
+
+const valueConversion = (event: any) => {
+  const { value } = event.target
+
+  valueToToken.value =  Number(value) / TAX_CONVERSION
+
+  enableSelectButton.value = false;
+  selectedDeposit.value = null;
+
+  depositList.value.forEach((deposit) => {
+    const p2pixTokenValue = blockchain.verifyDepositAmmount(deposit.args.amount);
+
+    if(valueToToken.value!! <= Number(p2pixTokenValue) && valueToToken.value!! != 0){
+      enableSelectButton.value = true;
+      hasLiquidity.value = true;
+      selectedDeposit.value = deposit;
+      return;
+    }
+  })
+
+  if(!enableSelectButton.value){
+    hasLiquidity.value = false
+  }
+}
+</script>
+
+<template>
+  <div class="page">
+    <div class="text-container">
+      <span class="text font-extrabold text-5xl max-w-[29rem]"
+        >Adquira crypto com apenas um Pix</span
+      >
+      <span class="text font-medium text-base max-w-[28rem]"
+        >Digite um valor, selecione uma oferta, conecta sua carteira e receba a
+        crypto após realizar o Pix</span
+      >
+    </div>
+    <div
+      class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
+    >
+      <div
+        class="flex justify-between w-full bg-white px-8 py-5 rounded-lg border-y-10 relative gap-2"
+      >
+        <p class="text-xl font-normal text-gray-900" v-if="valueToToken != undefined && valueToToken != 0">R$</p>
+        <input
+          type="number"
+          class="border-none outline-none text-lg text-gray-900 w-full"
+          v-bind:class="{ 'font-semibold': valueToToken != undefined, 'text-xl': valueToToken != undefined}"
+          placeholder="Digite o valor que deseja pagar"
+          @input="debounce(valueConversion, 500)($event)"
+          step=".01"
+        />
+        <p class="text-xl font-normal text-gray-900" v-if="valueToToken == undefined || valueToToken == 0">R$</p>
+      </div>
+      <div
+        class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
+      >
+        <div
+          class="bg-emerald-400 px-3 py-2.5 rounded-lg absolute bottom-position w-8 h-8"
+        >
+          <img alt="Ethereum image" src="@/assets/arrow.svg"/>
+        </div>
+
+        <div class="flex justify-between w-full items-center">
+          <p class="text-3xl text-gray-900">{{valueToToken.toFixed(3)}}</p>
+          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
+            <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
+            <p class="text-gray-900 text-lg">BRZ</p>
+          </div>
+        </div>
+
+        <div class="custom-divide py-2"></div>
+        <div class="flex justify-between pt-2" v-if="hasLiquidity">
+          <p class="text-gray-500 font-normal text-sm  w-fit">~ ETH 0,00 (+0,121%)</p>
+          <div class="flex gap-2">
+            <img alt="Polygon image" src="@/assets/polygon.svg" width="24px" height="24px"/>
+            <img alt="Ethereum image" src="@/assets/ethereum.svg" width="24px" height="24px"/>
+          </div>
+        </div>
+        <div class="flex pt-2 justify-center" v-if="!hasLiquidity">
+          <span class="text-red-500 font-normal text-sm">Atualmente não há liquidez nas redes para sua demanda</span>
+        </div>
+      </div>
+      <CustomButton
+        :text="'Selecionar Oferta'"
+        :is-disabled="!enableSelectButton"
+        @clicked="searchClick()"
+      />
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.custom-divide {
+  width: 100%;
+  border-bottom: 1px solid #d1d5db;
+}
+.bottom-position {
+  top: -20px;
+  right: 50%;
+  transform: translateX(50%);
+}
+
+.page {
+  @apply flex flex-col items-center justify-center w-full mt-16;
+}
+
+.text-container {
+  @apply flex flex-col items-center justify-center gap-4;
+}
+
+.text {
+  @apply text-gray-800 text-center;
+}
+
+input[type='number'] {
+    -moz-appearance:textfield;
+}
+
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+}
+</style>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 9fde481..ad8cc93 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,146 +1,11 @@
 <script setup lang="ts">
-import { ref } from "vue";
-import CustomButton from "../components/CustomButton.vue";
-import { debounce } from "@/utils/debounce";
-import { ethers } from "ethers";
-import { useEtherStore } from "@/store/ether";
-import { storeToRefs } from "pinia";
-import blockchain from "../utils/blockchain";
+import SearchComponent from "../components/SearchComponent.vue";
 
-const TAX_CONVERSION = 1.005
-const etherStore = useEtherStore();
-
-const { depositList } = storeToRefs(etherStore);
-
-const searchClick = () => {
-  console.log("pass the deposit and token value ammount to next screen")
-};
-
-const valueToToken = ref<Number>(0);
-const enableSelectButton = ref(false);
-const hasLiquidity = ref(true);
-const selectedDeposit = ref();
-
-const valueConversion = (event: any) => {
-  const { value } = event.target
-
-  valueToToken.value =  Number(value) / TAX_CONVERSION
-
-  enableSelectButton.value = false;
-  selectedDeposit.value = null;
-
-  depositList.value.forEach((deposit) => {
-    const p2pixTokenValue = blockchain.verifyDepositAmmount(deposit.args.amount);
-
-    if(valueToToken.value!! <= Number(p2pixTokenValue) && valueToToken.value!! != 0){
-      enableSelectButton.value = true;
-      hasLiquidity.value = true;
-      selectedDeposit.value = deposit;
-      return;
-    }
-  })
-
-  if(!enableSelectButton.value){
-    hasLiquidity.value = false
-  }
-}
 </script>
 
 <template>
-  <div class="page">
-    <div class="text-container">
-      <span class="text font-extrabold text-5xl max-w-[29rem]"
-        >Adquira crypto com apenas um Pix</span
-      >
-      <span class="text font-medium text-base max-w-[28rem]"
-        >Digite um valor, selecione uma oferta, conecta sua carteira e receba a
-        crypto após realizar o Pix</span
-      >
-    </div>
-    <div
-      class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
-    >
-      <div
-        class="flex justify-between w-full bg-white px-8 py-5 rounded-lg border-y-10 relative gap-2"
-      >
-        <p class="text-xl font-normal text-gray-900" v-if="valueToToken != undefined && valueToToken != 0">R$</p>
-        <input
-          type="number"
-          class="border-none outline-none text-lg text-gray-900 w-full"
-          v-bind:class="{ 'font-semibold': valueToToken != undefined, 'text-xl': valueToToken != undefined}"
-          placeholder="Digite o valor que deseja pagar"
-          @input="debounce(valueConversion, 500)($event)"
-          step=".01"
-        />
-        <p class="text-xl font-normal text-gray-900" v-if="valueToToken == undefined || valueToToken == 0">R$</p>
-      </div>
-      <div
-        class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
-      >
-        <div
-          class="bg-emerald-400 px-3 py-2.5 rounded-lg absolute bottom-position w-8 h-8"
-        >
-          <img alt="Ethereum image" src="@/assets/arrow.svg"/>
-        </div>
-
-        <div class="flex justify-between w-full items-center">
-          <p class="text-3xl text-gray-900">{{valueToToken.toFixed(3)}}</p>
-          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
-            <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
-            <p class="text-gray-900 text-lg">BRZ</p>
-          </div>
-        </div>
-
-        <div class="custom-divide py-2"></div>
-        <div class="flex justify-between pt-2" v-if="hasLiquidity">
-          <p class="text-gray-500 font-normal text-sm  w-fit">~ ETH 0,00 (+0,121%)</p>
-          <div class="flex gap-2">
-            <img alt="Polygon image" src="@/assets/polygon.svg" width="24px" height="24px"/>
-            <img alt="Ethereum image" src="@/assets/ethereum.svg" width="24px" height="24px"/>
-          </div>
-        </div>
-        <div class="flex pt-2 justify-center" v-if="!hasLiquidity">
-          <span class="text-red-500 font-normal text-sm">Atualmente não há liquidez nas redes para sua demanda</span>
-        </div>
-      </div>
-      <CustomButton
-        :text="'Selecionar Oferta'"
-        :is-disabled="!enableSelectButton"
-        @clicked="searchClick()"
-      />
-    </div>
-  </div>
+  <SearchComponent />
 </template>
 
 <style scoped>
-.custom-divide {
-  width: 100%;
-  border-bottom: 1px solid #d1d5db;
-}
-.bottom-position {
-  top: -20px;
-  right: 50%;
-  transform: translateX(50%);
-}
-
-.page {
-  @apply flex flex-col items-center justify-center w-full mt-20;
-}
-
-.text-container {
-  @apply flex flex-col items-center justify-center gap-4;
-}
-
-.text {
-  @apply text-gray-800 text-center;
-}
-
-input[type='number'] {
-    -moz-appearance:textfield;
-}
-
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
-    -webkit-appearance: none;
-}
 </style>

From fc508734a225db81f88aee0e7cfd177a39dcc723 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Fri, 25 Nov 2022 20:27:57 -0300
Subject: [PATCH 10/20] remove implementation ofsearch by money and only allow
 to search by token ammount

---
 src/components/CustomButton.vue    |  10 +--
 src/components/SearchComponent.vue | 123 ++++++++++++++++-------------
 src/utils/blockchain.ts            |  55 ++++++++-----
 src/utils/debounce.ts              |  16 ++--
 src/views/HomeView.vue             |   9 ++-
 src/views/MockView.vue             |  70 ++++++----------
 6 files changed, 147 insertions(+), 136 deletions(-)

diff --git a/src/components/CustomButton.vue b/src/components/CustomButton.vue
index 212fbf3..d459688 100644
--- a/src/components/CustomButton.vue
+++ b/src/components/CustomButton.vue
@@ -4,18 +4,18 @@ const props = defineProps({
   isDisabled: Boolean,
 });
 
-const emit = defineEmits(["clicked"]);
+const emit = defineEmits(["buttonClicked"]);
 </script>
 
 <template>
   <button
     type="button"
     class="button"
-    @click="emit('clicked')"
-    v-bind:class="{ 'opacity-70': isDisabled }"
-    :disabled="isDisabled"
+    @click="emit('buttonClicked')"
+    v-bind:class="{ 'opacity-70': props.isDisabled }"
+    :disabled="props.isDisabled ? props.isDisabled : false"
   >
-    {{ text }}
+    {{ props.text }}
   </button>
 </template>
 
diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 5d8b01a..075099d 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -2,90 +2,85 @@
 import { ref } from "vue";
 import CustomButton from "../components/CustomButton.vue";
 import { debounce } from "@/utils/debounce";
-import { ethers } from "ethers";
 import { useEtherStore } from "@/store/ether";
 import { storeToRefs } from "pinia";
 import blockchain from "../utils/blockchain";
 
-const TAX_CONVERSION = 1.005
 const etherStore = useEtherStore();
 
-const { depositList } = storeToRefs(etherStore);
+const { walletAddress, depositList } = storeToRefs(etherStore);
 
-const searchClick = () => {
-  console.log("pass the deposit and token value ammount to next screen")
-};
-
-const valueToToken = ref<Number>(0);
+const tokenValue = ref(0);
 const enableSelectButton = ref(false);
 const hasLiquidity = ref(true);
 const selectedDeposit = ref();
 
-const valueConversion = (event: any) => {
-  const { value } = event.target
+const handleInputEvent = (event: any) => {
+  const { value } = event.target;
 
-  valueToToken.value =  Number(value) / TAX_CONVERSION
+  tokenValue.value = Number(value);
+  verifyLiquidity();
+};
 
+const verifyLiquidity = () => {
   enableSelectButton.value = false;
   selectedDeposit.value = null;
 
-  depositList.value.forEach((deposit) => {
-    const p2pixTokenValue = blockchain.verifyDepositAmmount(deposit.args.amount);
+  if (!walletAddress.value) return;
 
-    if(valueToToken.value!! <= Number(p2pixTokenValue) && valueToToken.value!! != 0){
+  depositList.value.forEach((deposit) => {
+    const p2pixTokenValue = blockchain.verifyDepositAmmount(
+      deposit.args.amount
+    );
+
+    if (
+      tokenValue.value!! <= Number(p2pixTokenValue) &&
+      tokenValue.value!! != 0
+    ) {
       enableSelectButton.value = true;
       hasLiquidity.value = true;
       selectedDeposit.value = deposit;
       return;
     }
-  })
+  });
 
-  if(!enableSelectButton.value){
-    hasLiquidity.value = false
+  if (!enableSelectButton.value) {
+    hasLiquidity.value = false;
   }
-}
+};
+
+const emit = defineEmits(["tokenBuy"]);
 </script>
 
 <template>
   <div class="page">
     <div class="text-container">
       <span class="text font-extrabold text-5xl max-w-[29rem]"
-        >Adquira crypto com apenas um Pix</span
+        >Adquira cripto com apenas um Pix</span
       >
       <span class="text font-medium text-base max-w-[28rem]"
-        >Digite um valor, selecione uma oferta, conecta sua carteira e receba a
-        crypto após realizar o Pix</span
+        >Digite um valor, confira a oferta, conecte sua carteira e receba os
+        tokens após realizar o Pix</span
       >
     </div>
     <div
       class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
     >
-      <div
-        class="flex justify-between w-full bg-white px-8 py-5 rounded-lg border-y-10 relative gap-2"
-      >
-        <p class="text-xl font-normal text-gray-900" v-if="valueToToken != undefined && valueToToken != 0">R$</p>
-        <input
-          type="number"
-          class="border-none outline-none text-lg text-gray-900 w-full"
-          v-bind:class="{ 'font-semibold': valueToToken != undefined, 'text-xl': valueToToken != undefined}"
-          placeholder="Digite o valor que deseja pagar"
-          @input="debounce(valueConversion, 500)($event)"
-          step=".01"
-        />
-        <p class="text-xl font-normal text-gray-900" v-if="valueToToken == undefined || valueToToken == 0">R$</p>
-      </div>
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
       >
-        <div
-          class="bg-emerald-400 px-3 py-2.5 rounded-lg absolute bottom-position w-8 h-8"
-        >
-          <img alt="Ethereum image" src="@/assets/arrow.svg"/>
-        </div>
-
         <div class="flex justify-between w-full items-center">
-          <p class="text-3xl text-gray-900">{{valueToToken.toFixed(3)}}</p>
-          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full">
+          <input
+            type="number"
+            class="border-none outline-none text-lg text-gray-900 w-auto"
+            v-bind:class="{
+              'font-semibold': tokenValue != undefined,
+              'text-xl': tokenValue != undefined,
+            }"
+            @input="debounce(handleInputEvent, 500)($event)"
+            step=".01"
+          />
+          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full w-fit">
             <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
             <p class="text-gray-900 text-lg">BRZ</p>
           </div>
@@ -93,20 +88,40 @@ const valueConversion = (event: any) => {
 
         <div class="custom-divide py-2"></div>
         <div class="flex justify-between pt-2" v-if="hasLiquidity">
-          <p class="text-gray-500 font-normal text-sm  w-fit">~ ETH 0,00 (+0,121%)</p>
+          <p class="text-gray-500 font-normal text-sm w-auto">
+            ~ R$ {{ tokenValue.toFixed(2) }}
+          </p>
           <div class="flex gap-2">
-            <img alt="Polygon image" src="@/assets/polygon.svg" width="24px" height="24px"/>
-            <img alt="Ethereum image" src="@/assets/ethereum.svg" width="24px" height="24px"/>
+            <img
+              alt="Polygon image"
+              src="@/assets/polygon.svg"
+              width="24"
+              height="24"
+            />
+            <img
+              alt="Ethereum image"
+              src="@/assets/ethereum.svg"
+              width="24"
+              height="24"
+            />
           </div>
         </div>
         <div class="flex pt-2 justify-center" v-if="!hasLiquidity">
-          <span class="text-red-500 font-normal text-sm">Atualmente não há liquidez nas redes para sua demanda</span>
+          <span class="text-red-500 font-normal text-sm"
+            >Atualmente não há liquidez nas redes para sua demanda</span
+          >
         </div>
       </div>
       <CustomButton
-        :text="'Selecionar Oferta'"
+        v-if="!walletAddress"
+        :text="'Conectar carteira'"
+        @buttonClicked="blockchain.connectProvider()"
+      />
+      <CustomButton
+        v-if="walletAddress"
+        :text="'Confirmar compra'"
         :is-disabled="!enableSelectButton"
-        @clicked="searchClick()"
+        @buttonClicked="emit('tokenBuy')"
       />
     </div>
   </div>
@@ -135,12 +150,12 @@ const valueConversion = (event: any) => {
   @apply text-gray-800 text-center;
 }
 
-input[type='number'] {
-    -moz-appearance:textfield;
+input[type="number"] {
+  -moz-appearance: textfield;
 }
 
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
-    -webkit-appearance: none;
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
 }
 </style>
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 6fd4214..e8ecb20 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -6,7 +6,7 @@ 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 { wallets } from "./smart_contract_files/wallets.json"
+import { wallets } from "./smart_contract_files/wallets.json";
 
 const updateWalletStatus = async (walletAddress: string) => {
   const etherStore = useEtherStore();
@@ -44,7 +44,7 @@ const connectProvider = async () => {
   const filter = p2pContract.filters.DepositAdded(null);
   const events = await p2pContract.queryFilter(filter);
 
-  console.log(events)
+  console.log(events);
   etherStore.setDepositList(events);
 
   connection.on("accountsChanged", (accounts: string[]) => {
@@ -60,12 +60,14 @@ const splitTokens = async () => {
   const signer = provider.getSigner();
   const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
 
-  for (var i = 0; i < wallets.length; i++){
-    const tx = await contract.transfer(wallets[i], ethers.utils.parseEther("4000000.0"));
-    await tx.wait()
+  for (let i = 0; i < wallets.length; i++) {
+    const tx = await contract.transfer(
+      wallets[i],
+      ethers.utils.parseEther("4000000.0")
+    );
+    await tx.wait();
     updateWalletStatus(etherStore.walletAddress);
   }
-  
 };
 
 const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
@@ -75,16 +77,26 @@ const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
 
   const signer = provider.getSigner();
 
-  const tokenContract = new ethers.Contract(addresses.token, mockToken.abi, signer);
+  const tokenContract = new ethers.Contract(
+    addresses.token,
+    mockToken.abi,
+    signer
+  );
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
   // first get the approval
-  const apprv = await tokenContract.approve(addresses.p2pix, ethers.utils.parseEther(tokenQty));
+  const apprv = await tokenContract.approve(
+    addresses.p2pix,
+    ethers.utils.parseEther(tokenQty)
+  );
   await apprv.wait();
 
-
   // deposit
-  const deposit = await p2pContract.deposit(addresses.token, ethers.utils.parseEther(tokenQty), pixKey);
+  const deposit = await p2pContract.deposit(
+    addresses.token,
+    ethers.utils.parseEther(tokenQty),
+    pixKey
+  );
   await deposit.wait();
 
   updateWalletStatus(etherStore.walletAddress);
@@ -92,13 +104,11 @@ const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
   const filter = p2pContract.filters.DepositAdded(null);
   const events = await p2pContract.queryFilter(filter);
 
-  console.log(events)
+  console.log(events);
 
   etherStore.setDepositList(events);
-
 };
 
-
 const countDeposit = async () => {
   const provider = getProvider();
   if (!provider) return;
@@ -108,7 +118,7 @@ const countDeposit = async () => {
 
   const count = await contract.depositCount();
 
-  console.log(Number(count))
+  console.log(Number(count));
 };
 
 const mapDeposits = async (depositId: BigNumber) => {
@@ -120,7 +130,7 @@ const mapDeposits = async (depositId: BigNumber) => {
 
   const deposit = await contract.mapDeposits(depositId);
 
-  console.log(deposit)
+  console.log(deposit);
 };
 
 const formatEther = (balance: string) => {
@@ -129,9 +139,8 @@ const formatEther = (balance: string) => {
 };
 
 const verifyDepositAmmount = (ammountBigNumber: BigNumber): string => {
-  return ethers.utils.formatEther(ammountBigNumber)
-}
-
+  return ethers.utils.formatEther(ammountBigNumber);
+};
 
 const getProvider = (): ethers.providers.Web3Provider | null => {
   const window_ = window as any;
@@ -142,4 +151,12 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
   return new ethers.providers.Web3Provider(connection);
 };
 
-export default { connectProvider, formatEther, splitTokens, mockDeposit, countDeposit, mapDeposits, verifyDepositAmmount };
+export default {
+  connectProvider,
+  formatEther,
+  splitTokens,
+  mockDeposit,
+  countDeposit,
+  mapDeposits,
+  verifyDepositAmmount,
+};
diff --git a/src/utils/debounce.ts b/src/utils/debounce.ts
index 2079277..8da2c6e 100644
--- a/src/utils/debounce.ts
+++ b/src/utils/debounce.ts
@@ -1,9 +1,9 @@
 export const debounce = (func: any, delay: number) => {
-    let timer: any = null
-    return function (this: unknown, ...args: any) {
-      clearTimeout(timer)
-      timer = setTimeout(() => {
-        func.apply(this, args)
-      }, delay) 
-    }
-  }
\ No newline at end of file
+  let timer: any = null;
+  return function (this: unknown, ...args: any) {
+    clearTimeout(timer);
+    timer = setTimeout(() => {
+      func.apply(this, args);
+    }, delay);
+  };
+};
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index ad8cc93..546bb34 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import SearchComponent from "../components/SearchComponent.vue";
 
+const confirmBuyClick = () => {
+  // finish buy screen
+  console.log("compra confirmada");
+};
 </script>
 
 <template>
-  <SearchComponent />
+  <SearchComponent @token-buy="confirmBuyClick()" />
 </template>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
index c2ba80f..31962f9 100644
--- a/src/views/MockView.vue
+++ b/src/views/MockView.vue
@@ -7,7 +7,7 @@ import blockchain from "../utils/blockchain";
 
 const etherStore = useEtherStore();
 
-const { walletAddress, balance, depositList } = storeToRefs(etherStore);
+const { depositList } = storeToRefs(etherStore);
 
 const depositValue = ref<Number>();
 const depositPixKey = ref<string>("");
@@ -17,7 +17,7 @@ const splitTokens = () => {
 };
 
 const mockDeposit = () => {
-  if(!depositValue.value || !depositPixKey.value) return;
+  if (!depositValue.value || !depositPixKey.value) return;
   blockchain.mockDeposit(depositValue.value.toString(), depositPixKey.value);
 };
 
@@ -25,38 +25,15 @@ const countDeposit = () => {
   blockchain.countDeposit();
 };
 
-const formatWalletAddress = (): string => {
-  const walletAddressLength = walletAddress.value.length;
-  const initialText = walletAddress.value.substring(0, 5);
-  const finalText = walletAddress.value.substring(
-    walletAddressLength - 5,
-    walletAddressLength - 1
-  );
-  return `${initialText} ... ${finalText}`;
-};
-
 const mapDeposit = (depositId: BigNumber) => {
-  blockchain.mapDeposits(depositId)
-}
-
-const formatWalletBalance = (): string => {
-  const formattedBalance = blockchain.formatEther(balance.value);
-  const fixed = formattedBalance.substring(0, 8);
-
-  return fixed;
+  blockchain.mapDeposits(depositId);
 };
 </script>
 
 <template>
-  
   <div class="page">
-
     <div class="flex flex-col gap-4 justify-start items-start w-2/3">
-      <button 
-        type="button" 
-        class="default-button"
-        @click="countDeposit()"
-      >
+      <button type="button" class="default-button" @click="countDeposit()">
         Contar depósitos
       </button>
 
@@ -74,27 +51,27 @@ const formatWalletBalance = (): string => {
           placeholder="Chave pix"
           v-model="depositPixKey"
         />
-        
-        <button 
-          type="button" 
-          class="default-button"
-          @click="mockDeposit()"
-        >
+
+        <button type="button" class="default-button" @click="mockDeposit()">
           Mockar depósitos
         </button>
       </div>
 
-      <button 
-        type="button" 
-        class="default-button"
-        @click="splitTokens()"
-      >
+      <button type="button" class="default-button" @click="splitTokens()">
         Dividir tokens
       </button>
     </div>
 
     <ul class="flex flex-col justify-center items-center gap-4">
-      <li class="text-gray-900 font-semibold text-lg cursor-pointer border-2 border-amber-400 p-2 rounded-md bg-amber-200"  v-for="deposit in depositList" :key="deposit['blockNumber']" @click="mapDeposit(deposit['args']['depositID'])">{{deposit['args']['0']}} : MRBZ {{blockchain.formatEther(deposit['args']['amount'])}} </li>
+      <li
+        class="text-gray-900 font-semibold text-lg cursor-pointer border-2 border-amber-400 p-2 rounded-md bg-amber-200"
+        v-for="deposit in depositList"
+        :key="deposit['blockNumber']"
+        @click="mapDeposit(deposit['args']['depositID'])"
+      >
+        {{ deposit["args"]["0"] }} : MRBZ
+        {{ blockchain.formatEther(deposit["args"]["amount"]) }}
+      </li>
     </ul>
   </div>
 </template>
@@ -104,22 +81,21 @@ header {
   @apply flex flex-row justify-between w-full items-center;
 }
 
-.default-button{
-  @apply p-2 rounded border-2 border-amber-400 text-gray-50 font-extrabold text-base w-full
+.default-button {
+  @apply p-2 rounded border-2 border-amber-400 text-gray-50 font-extrabold text-base w-full;
 }
 
-.default-input{
-  @apply border-none outline-none text-lg text-gray-900 w-64 p-2 rounded-lg
+.default-input {
+  @apply border-none outline-none text-lg text-gray-900 w-64 p-2 rounded-lg;
 }
 
-.page{
-  @apply flex gap-8 mt-24
+.page {
+  @apply flex gap-8 mt-24;
 }
 
 @media (max-width: 1024px) {
   .page {
-    @apply flex-wrap
+    @apply flex-wrap;
   }
 }
-
 </style>

From bbca2374d1f842590782ba0851cc3944ae07d625 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Sat, 26 Nov 2022 14:07:16 -0300
Subject: [PATCH 11/20] fix css and add connectAccount method that run
 verifyLiquidity after connected

---
 src/components/SearchComponent.vue | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 075099d..6c7346b 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -15,6 +15,11 @@ const enableSelectButton = ref(false);
 const hasLiquidity = ref(true);
 const selectedDeposit = ref();
 
+const connectAccount = async () => {
+  await blockchain.connectProvider();
+  verifyLiquidity()
+}
+
 const handleInputEvent = (event: any) => {
   const { value } = event.target;
 
@@ -64,7 +69,7 @@ const emit = defineEmits(["tokenBuy"]);
       >
     </div>
     <div
-      class="flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md w-1/3 mt-10"
+      class="blur-container"
     >
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
@@ -72,17 +77,18 @@ const emit = defineEmits(["tokenBuy"]);
         <div class="flex justify-between w-full items-center">
           <input
             type="number"
-            class="border-none outline-none text-lg text-gray-900 w-auto"
+            class="border-none outline-none text-lg text-gray-900 w-fit"
             v-bind:class="{
               'font-semibold': tokenValue != undefined,
               'text-xl': tokenValue != undefined,
             }"
             @input="debounce(handleInputEvent, 500)($event)"
+            placeholder="0  "
             step=".01"
           />
-          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-full w-fit">
-            <img alt="Ethereum image" class="mr-3" src="@/assets/brz.svg" />
-            <p class="text-gray-900 text-lg">BRZ</p>
+          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-3xl min-w-fit gap-1">
+            <img alt="Token image" class="w-fit" src="@/assets/brz.svg" />
+            <span class="text-gray-900 text-lg w-fit" id="brz">BRZ</span>
           </div>
         </div>
 
@@ -115,7 +121,7 @@ const emit = defineEmits(["tokenBuy"]);
       <CustomButton
         v-if="!walletAddress"
         :text="'Conectar carteira'"
-        @buttonClicked="blockchain.connectProvider()"
+        @buttonClicked="connectAccount()"
       />
       <CustomButton
         v-if="walletAddress"
@@ -150,6 +156,10 @@ const emit = defineEmits(["tokenBuy"]);
   @apply text-gray-800 text-center;
 }
 
+.blur-container {
+  @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10
+}
+
 input[type="number"] {
   -moz-appearance: textfield;
 }

From 8da7f6a4ff7f39766b3e851b5871b28d52729004 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Sat, 26 Nov 2022 14:25:19 -0300
Subject: [PATCH 12/20] emit selectedDeposit and token value to Home component
 when confirm button is clicked

---
 src/components/SearchComponent.vue | 18 +++++++++---------
 src/views/HomeView.vue             |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 6c7346b..e2f376a 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -17,8 +17,8 @@ const selectedDeposit = ref();
 
 const connectAccount = async () => {
   await blockchain.connectProvider();
-  verifyLiquidity()
-}
+  verifyLiquidity();
+};
 
 const handleInputEvent = (event: any) => {
   const { value } = event.target;
@@ -31,7 +31,7 @@ const verifyLiquidity = () => {
   enableSelectButton.value = false;
   selectedDeposit.value = null;
 
-  if (!walletAddress.value) return;
+  if (!walletAddress.value || tokenValue.value == 0) return;
 
   depositList.value.forEach((deposit) => {
     const p2pixTokenValue = blockchain.verifyDepositAmmount(
@@ -68,9 +68,7 @@ const emit = defineEmits(["tokenBuy"]);
         tokens após realizar o Pix</span
       >
     </div>
-    <div
-      class="blur-container"
-    >
+    <div class="blur-container">
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
       >
@@ -86,7 +84,9 @@ const emit = defineEmits(["tokenBuy"]);
             placeholder="0  "
             step=".01"
           />
-          <div class="flex flex-row p-2 px-3 bg-gray-300 rounded-3xl min-w-fit gap-1">
+          <div
+            class="flex flex-row p-2 px-3 bg-gray-300 rounded-3xl min-w-fit gap-1"
+          >
             <img alt="Token image" class="w-fit" src="@/assets/brz.svg" />
             <span class="text-gray-900 text-lg w-fit" id="brz">BRZ</span>
           </div>
@@ -127,7 +127,7 @@ const emit = defineEmits(["tokenBuy"]);
         v-if="walletAddress"
         :text="'Confirmar compra'"
         :is-disabled="!enableSelectButton"
-        @buttonClicked="emit('tokenBuy')"
+        @buttonClicked="emit('tokenBuy', { selectedDeposit, tokenValue })"
       />
     </div>
   </div>
@@ -157,7 +157,7 @@ const emit = defineEmits(["tokenBuy"]);
 }
 
 .blur-container {
-  @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10
+  @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10;
 }
 
 input[type="number"] {
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 546bb34..7a1afc9 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,14 +1,16 @@
 <script setup lang="ts">
 import SearchComponent from "../components/SearchComponent.vue";
 
-const confirmBuyClick = () => {
+const confirmBuyClick = ({ selectedDeposit, tokenValue }: any) => {
   // finish buy screen
+  console.log(selectedDeposit);
+  console.log(tokenValue);
   console.log("compra confirmada");
 };
 </script>
 
 <template>
-  <SearchComponent @token-buy="confirmBuyClick()" />
+  <SearchComponent @token-buy="confirmBuyClick" />
 </template>
 
 <style scoped></style>

From 9593eea6b90148e278ace479e6c8695b84bedc99 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Sat, 26 Nov 2022 14:26:19 -0300
Subject: [PATCH 13/20] remove fix from lint script on package json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a7ed188..8f2ff50 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "serve": "vue-cli-service serve",
     "build-only": "vite build",
     "type-check": "vue-tsc --noEmit",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore --fix"
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
+    "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
     "@headlessui/vue": "^1.7.3",

From c5162c18962be23c31221ff7e4124189b0c1c064 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Sat, 26 Nov 2022 16:07:04 -0300
Subject: [PATCH 14/20] Adding 2 decimal places restrition to search tokens
 component input

---
 src/components/SearchComponent.vue | 24 +++++++++++++++++++++++-
 src/components/TopBar.vue          |  1 +
 src/views/MockView.vue             |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index e2f376a..e978a4c 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -13,6 +13,7 @@ const { walletAddress, depositList } = storeToRefs(etherStore);
 const tokenValue = ref(0);
 const enableSelectButton = ref(false);
 const hasLiquidity = ref(true);
+const validDecimals = ref(true)
 const selectedDeposit = ref();
 
 const connectAccount = async () => {
@@ -24,9 +25,25 @@ const handleInputEvent = (event: any) => {
   const { value } = event.target;
 
   tokenValue.value = Number(value);
+
+  if (decimalCount(tokenValue.value) > 2){
+    validDecimals.value = false;
+    enableSelectButton.value = false;
+    return;
+  }
+  validDecimals.value = true;
+
   verifyLiquidity();
 };
 
+const decimalCount = (num: Number) => {
+   const numStr = String(num);
+   if (numStr.includes('.')) {
+      return numStr.split('.')[1].length;
+   };
+   return 0;
+}
+
 const verifyLiquidity = () => {
   enableSelectButton.value = false;
   selectedDeposit.value = null;
@@ -112,7 +129,12 @@ const emit = defineEmits(["tokenBuy"]);
             />
           </div>
         </div>
-        <div class="flex pt-2 justify-center" v-if="!hasLiquidity">
+        <div class="flex pt-2 justify-center" v-if="!validDecimals">
+          <span class="text-red-500 font-normal text-sm"
+            >Por favor utilize no máximo 2 casas decimais</span
+          >
+        </div>
+        <div class="flex pt-2 justify-center" v-else-if="!hasLiquidity">
           <span class="text-red-500 font-normal text-sm"
             >Atualmente não há liquidez nas redes para sua demanda</span
           >
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index c43399d..710503b 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -37,6 +37,7 @@ const formatWalletBalance = (): string => {
       src="@/assets/logo.svg"
       width="75"
       height="75"
+      @load="connectMetaMask()"
     />
     <div class="flex gap-4 items-center">
       <button type="button" class="default-button">Quero vender</button>
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
index 31962f9..e8ed8f2 100644
--- a/src/views/MockView.vue
+++ b/src/views/MockView.vue
@@ -69,8 +69,8 @@ const mapDeposit = (depositId: BigNumber) => {
         :key="deposit['blockNumber']"
         @click="mapDeposit(deposit['args']['depositID'])"
       >
-        {{ deposit["args"]["0"] }} : MRBZ
-        {{ blockchain.formatEther(deposit["args"]["amount"]) }}
+        Address:<br>{{ deposit["args"]["0"] }}<br>
+        MRBZ: {{ blockchain.formatEther(deposit["args"]["amount"]) }}
       </li>
     </ul>
   </div>

From ee35c17b6ee7abe76d0d4837b00042c5e66f61b4 Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Tue, 29 Nov 2022 17:49:24 -0300
Subject: [PATCH 15/20] preparing props for next steps fafter search

---
 src/components/SearchComponent.vue | 16 ++++++++--------
 src/utils/blockchain.ts            |  1 +
 src/views/HomeView.vue             |  9 +++++++--
 src/views/MockView.vue             |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index e978a4c..f1113c7 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -13,7 +13,7 @@ const { walletAddress, depositList } = storeToRefs(etherStore);
 const tokenValue = ref(0);
 const enableSelectButton = ref(false);
 const hasLiquidity = ref(true);
-const validDecimals = ref(true)
+const validDecimals = ref(true);
 const selectedDeposit = ref();
 
 const connectAccount = async () => {
@@ -26,7 +26,7 @@ const handleInputEvent = (event: any) => {
 
   tokenValue.value = Number(value);
 
-  if (decimalCount(tokenValue.value) > 2){
+  if (decimalCount(tokenValue.value) > 2) {
     validDecimals.value = false;
     enableSelectButton.value = false;
     return;
@@ -37,12 +37,12 @@ const handleInputEvent = (event: any) => {
 };
 
 const decimalCount = (num: Number) => {
-   const numStr = String(num);
-   if (numStr.includes('.')) {
-      return numStr.split('.')[1].length;
-   };
-   return 0;
-}
+  const numStr = String(num);
+  if (numStr.includes(".")) {
+    return numStr.split(".")[1].length;
+  }
+  return 0;
+};
 
 const verifyLiquidity = () => {
   enableSelectButton.value = false;
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index e8ecb20..346e5c2 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -131,6 +131,7 @@ const mapDeposits = async (depositId: BigNumber) => {
   const deposit = await contract.mapDeposits(depositId);
 
   console.log(deposit);
+  return deposit;
 };
 
 const formatEther = (balance: string) => {
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 7a1afc9..8ea3c70 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,11 +1,16 @@
 <script setup lang="ts">
 import SearchComponent from "../components/SearchComponent.vue";
+import blockchain from "../utils/blockchain";
 
-const confirmBuyClick = ({ selectedDeposit, tokenValue }: any) => {
+const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
   // finish buy screen
   console.log(selectedDeposit);
+  let depositDetail;
+  await blockchain
+    .mapDeposits(selectedDeposit["args"]["depositID"])
+    .then((deposit) => (depositDetail = deposit));
   console.log(tokenValue);
-  console.log("compra confirmada");
+  console.log(depositDetail);
 };
 </script>
 
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
index e8ed8f2..68ab74f 100644
--- a/src/views/MockView.vue
+++ b/src/views/MockView.vue
@@ -69,7 +69,7 @@ const mapDeposit = (depositId: BigNumber) => {
         :key="deposit['blockNumber']"
         @click="mapDeposit(deposit['args']['depositID'])"
       >
-        Address:<br>{{ deposit["args"]["0"] }}<br>
+        Address:<br />{{ deposit["args"]["0"] }}<br />
         MRBZ: {{ blockchain.formatEther(deposit["args"]["amount"]) }}
       </li>
     </ul>

From e3cb9275c53418f79a195f1208309df9dd833009 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Tue, 29 Nov 2022 20:25:11 -0300
Subject: [PATCH 16/20] fixing search tokens iteration structure and wallet
 address formatting

---
 src/components/SearchComponent.vue            |  27 ++-
 src/components/TopBar.vue                     |   4 +-
 src/utils/blockchain.ts                       |  13 +-
 .../smart_contract_files/EventAndErrors.json  | 219 ++++++++++++++++++
 4 files changed, 250 insertions(+), 13 deletions(-)
 create mode 100644 src/utils/smart_contract_files/EventAndErrors.json

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index f1113c7..651bc1d 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -50,20 +50,22 @@ const verifyLiquidity = () => {
 
   if (!walletAddress.value || tokenValue.value == 0) return;
 
-  depositList.value.forEach((deposit) => {
+  const found = depositList.value.find((element) => {
     const p2pixTokenValue = blockchain.verifyDepositAmmount(
-      deposit.args.amount
+      element.args.amount
     );
-
     if (
       tokenValue.value!! <= Number(p2pixTokenValue) &&
-      tokenValue.value!! != 0
+      tokenValue.value!! != 0 &&
+      element.args.seller !== walletAddress.value
     ) {
       enableSelectButton.value = true;
       hasLiquidity.value = true;
-      selectedDeposit.value = deposit;
-      return;
+      selectedDeposit.value = element;
+      console.log("Selected is :", blockchain.verifyDepositAmmount(element.args.amount))
+      return true;
     }
+    return false;
   });
 
   if (!enableSelectButton.value) {
@@ -72,6 +74,19 @@ const verifyLiquidity = () => {
 };
 
 const emit = defineEmits(["tokenBuy"]);
+
+const confirmPurchase = async () => {
+  
+  const buyInfo = {
+    "buyer":"",
+    "seller":"",
+    "amount":"",
+    "depositID":"",
+    "pixKey":""
+  }
+  
+};
+
 </script>
 
 <template>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 710503b..704d64e 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -15,8 +15,8 @@ const formatWalletAddress = (): string => {
   const walletAddressLength = walletAddress.value.length;
   const initialText = walletAddress.value.substring(0, 5);
   const finalText = walletAddress.value.substring(
-    walletAddressLength - 5,
-    walletAddressLength - 1
+    walletAddressLength - 4,
+    walletAddressLength
   );
   return `${initialText}...${finalText}`;
 };
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 346e5c2..a611981 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -5,6 +5,7 @@ import { BigNumber, ethers } from "ethers";
 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"
 
 import { wallets } from "./smart_contract_files/wallets.json";
 
@@ -19,7 +20,7 @@ const updateWalletStatus = async (walletAddress: string) => {
   const balance = await contract.balanceOf(walletAddress);
 
   etherStore.setBalance(String(balance));
-  etherStore.setWalletAddress(walletAddress);
+  etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress));
 };
 
 const connectProvider = async () => {
@@ -36,10 +37,10 @@ const connectProvider = async () => {
   const walletAddress = await provider.send("eth_requestAccounts", []);
   const balance = await contract.balanceOf(walletAddress[0]);
 
-  etherStore.setWalletAddress(walletAddress[0]);
+  etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
   etherStore.setBalance(String(balance));
 
-  const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+  const p2pContract = new ethers.Contract(addresses.p2pix, p2pEventsAndErrors.abi, signer);
 
   const filter = p2pContract.filters.DepositAdded(null);
   const events = await p2pContract.queryFilter(filter);
@@ -101,8 +102,10 @@ const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
 
   updateWalletStatus(etherStore.walletAddress);
 
-  const filter = p2pContract.filters.DepositAdded(null);
-  const events = await p2pContract.queryFilter(filter);
+  const p2pEvents = new ethers.Contract(addresses.p2pix, p2pEventsAndErrors.abi, signer);
+
+  const filter = p2pEvents.filters.DepositAdded(null);
+  const events = await p2pEvents.queryFilter(filter);
 
   console.log(events);
 
diff --git a/src/utils/smart_contract_files/EventAndErrors.json b/src/utils/smart_contract_files/EventAndErrors.json
new file mode 100644
index 0000000..1cfa90a
--- /dev/null
+++ b/src/utils/smart_contract_files/EventAndErrors.json
@@ -0,0 +1,219 @@
+{
+  "_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": {}
+}

From 89ab78d68271108d262fb3700d7489543df160c9 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Tue, 29 Nov 2022 21:19:36 -0300
Subject: [PATCH 17/20] fixing search tokens iteration structure and wallet
 address formatting - fixed

---
 src/components/SearchComponent.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 651bc1d..8df0e61 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -75,18 +75,6 @@ const verifyLiquidity = () => {
 
 const emit = defineEmits(["tokenBuy"]);
 
-const confirmPurchase = async () => {
-  
-  const buyInfo = {
-    "buyer":"",
-    "seller":"",
-    "amount":"",
-    "depositID":"",
-    "pixKey":""
-  }
-  
-};
-
 </script>
 
 <template>

From 5ab8dcc8ea50ad48d54ffdc9ee9dbcf127e05917 Mon Sep 17 00:00:00 2001
From: Ronyell <ronyellhenrque@gmail.comm>
Date: Tue, 29 Nov 2022 22:40:18 -0300
Subject: [PATCH 18/20] applying default structure order

---
 src/components/SearchComponent.vue | 9 ++++++---
 src/components/TopBar.vue          | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 8df0e61..af592ef 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -6,16 +6,22 @@ import { useEtherStore } from "@/store/ether";
 import { storeToRefs } from "pinia";
 import blockchain from "../utils/blockchain";
 
+// Store reference
 const etherStore = useEtherStore();
 
 const { walletAddress, depositList } = storeToRefs(etherStore);
 
+// Reactive state
 const tokenValue = ref(0);
 const enableSelectButton = ref(false);
 const hasLiquidity = ref(true);
 const validDecimals = ref(true);
 const selectedDeposit = ref();
 
+// Emits
+const emit = defineEmits(["tokenBuy"]);
+
+// Methods
 const connectAccount = async () => {
   await blockchain.connectProvider();
   verifyLiquidity();
@@ -72,9 +78,6 @@ const verifyLiquidity = () => {
     hasLiquidity.value = false;
   }
 };
-
-const emit = defineEmits(["tokenBuy"]);
-
 </script>
 
 <template>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 704d64e..5349b61 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -3,10 +3,12 @@ import { storeToRefs } from "pinia";
 import { useEtherStore } from "../store/ether";
 import blockchain from "../utils/blockchain";
 
+// Store reference
 const etherStore = useEtherStore();
 
 const { walletAddress, balance } = storeToRefs(etherStore);
 
+//Methods
 const connectMetaMask = () => {
   blockchain.connectProvider();
 };

From 93309d938df3f20bc073b217f346756bce8529c0 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Thu, 1 Dec 2022 20:02:37 -0300
Subject: [PATCH 19/20] Locks implemented, Some events filters implemented,
 Updated smart contract artifacts

---
 src/components/SearchComponent.vue            |  18 +-
 src/components/TopBar.vue                     |   1 -
 src/store/ether.ts                            |  22 +-
 src/utils/blockchain.ts                       | 198 ++++++++++------
 .../smart_contract_files/EventAndErrors.json  | 219 ------------------
 src/utils/smart_contract_files/P2PIX.json     |  67 +++---
 src/views/HomeView.vue                        |  31 +++
 src/views/MockView.vue                        |  68 ++++--
 8 files changed, 270 insertions(+), 354 deletions(-)
 delete mode 100644 src/utils/smart_contract_files/EventAndErrors.json

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index af592ef..fd794b5 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -9,7 +9,7 @@ import blockchain from "../utils/blockchain";
 // Store reference
 const etherStore = useEtherStore();
 
-const { walletAddress, depositList } = storeToRefs(etherStore);
+const { walletAddress, depositsAddedList } = storeToRefs(etherStore);
 
 // Reactive state
 const tokenValue = ref(0);
@@ -21,12 +21,13 @@ const selectedDeposit = ref();
 // Emits
 const emit = defineEmits(["tokenBuy"]);
 
-// Methods
+// Blockchain methods
 const connectAccount = async () => {
   await blockchain.connectProvider();
   verifyLiquidity();
 };
 
+// Debounce methods
 const handleInputEvent = (event: any) => {
   const { value } = event.target;
 
@@ -42,6 +43,8 @@ const handleInputEvent = (event: any) => {
   verifyLiquidity();
 };
 
+// Enable button methods
+// Check if has more than 2 decimal places
 const decimalCount = (num: Number) => {
   const numStr = String(num);
   if (numStr.includes(".")) {
@@ -49,15 +52,15 @@ const decimalCount = (num: Number) => {
   }
   return 0;
 };
-
+// Verify if there is a valid deposit to buy
 const verifyLiquidity = () => {
   enableSelectButton.value = false;
   selectedDeposit.value = null;
 
-  if (!walletAddress.value || tokenValue.value == 0) return;
+  if (!walletAddress.value || tokenValue.value <= 0) return;
 
-  const found = depositList.value.find((element) => {
-    const p2pixTokenValue = blockchain.verifyDepositAmmount(
+  const found = depositsAddedList.value.find((element) => {
+    const p2pixTokenValue = blockchain.formatBigNumber(
       element.args.amount
     );
     if (
@@ -68,7 +71,7 @@ const verifyLiquidity = () => {
       enableSelectButton.value = true;
       hasLiquidity.value = true;
       selectedDeposit.value = element;
-      console.log("Selected is :", blockchain.verifyDepositAmmount(element.args.amount))
+      console.log("Selected is :", blockchain.formatBigNumber(element.args.amount))
       return true;
     }
     return false;
@@ -78,6 +81,7 @@ const verifyLiquidity = () => {
     hasLiquidity.value = false;
   }
 };
+
 </script>
 
 <template>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 5349b61..f2bcb78 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -39,7 +39,6 @@ const formatWalletBalance = (): string => {
       src="@/assets/logo.svg"
       width="75"
       height="75"
-      @load="connectMetaMask()"
     />
     <div class="flex gap-4 items-center">
       <button type="button" class="default-button">Quero vender</button>
diff --git a/src/store/ether.ts b/src/store/ether.ts
index 3a5b62b..4a56135 100644
--- a/src/store/ether.ts
+++ b/src/store/ether.ts
@@ -4,7 +4,14 @@ export const useEtherStore = defineStore("ether", {
   state: () => ({
     walletAddress: "",
     balance: "",
-    depositList: [{}],
+    // Depósitos válidos para compra
+    depositsValidList: [{}],
+    // Depósitos adicionados na blockchain
+    depositsAddedList: [{}],
+    // Depósitos expirados na blockchain
+    depositsExpiredList: [{}],
+    // Locks adicionados na blockchain
+    locksAddedList: [{}],
   }),
   actions: {
     setWalletAddress(walletAddress: string) {
@@ -13,8 +20,17 @@ export const useEtherStore = defineStore("ether", {
     setBalance(balance: string) {
       this.balance = balance;
     },
-    setDepositList(depositList: any[]) {
-      this.depositList = depositList;
+    setDepositsValidList(depositsValidList: any[]) {
+      this.depositsValidList = depositsValidList;
+    },
+    setDepositsAddedList(depositsAddedList: any[]) {
+      this.depositsAddedList = depositsAddedList;
+    },
+    setDepositsExpiredList(depositsExpiredList: any[]) {
+      this.depositsExpiredList = depositsExpiredList;
+    },
+    setLocksAddedList(locksAddedList: any[]) {
+      this.locksAddedList = locksAddedList;
     },
   },
 });
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index a611981..4a49614 100644
--- a/src/utils/blockchain.ts
+++ b/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,
 };
diff --git a/src/utils/smart_contract_files/EventAndErrors.json b/src/utils/smart_contract_files/EventAndErrors.json
deleted file mode 100644
index 1cfa90a..0000000
--- a/src/utils/smart_contract_files/EventAndErrors.json
+++ /dev/null
@@ -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": {}
-}
diff --git a/src/utils/smart_contract_files/P2PIX.json b/src/utils/smart_contract_files/P2PIX.json
index 04d915b..34e712f 100644
--- a/src/utils/smart_contract_files/P2PIX.json
+++ b/src/utils/smart_contract_files/P2PIX.json
@@ -90,12 +90,6 @@
           "name": "token",
           "type": "address"
         },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "premium",
-          "type": "uint256"
-        },
         {
           "indexed": false,
           "internalType": "uint256",
@@ -150,6 +144,25 @@
       "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": [
@@ -238,25 +251,6 @@
       "name": "OwnerUpdated",
       "type": "event"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "PremiumsWithdrawn",
-      "type": "event"
-    },
     {
       "inputs": [
         {
@@ -306,17 +300,17 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "token",
+          "name": "_token",
           "type": "address"
         },
         {
           "internalType": "uint256",
-          "name": "amount",
+          "name": "_amount",
           "type": "uint256"
         },
         {
           "internalType": "string",
-          "name": "pixTarget",
+          "name": "_pixTarget",
           "type": "string"
         }
       ],
@@ -328,7 +322,7 @@
           "type": "uint256"
         }
       ],
-      "stateMutability": "payable",
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
@@ -403,11 +397,6 @@
           "name": "remaining",
           "type": "uint256"
         },
-        {
-          "internalType": "uint256",
-          "name": "premium",
-          "type": "uint256"
-        },
         {
           "internalType": "string",
           "name": "pixTarget",
@@ -587,14 +576,18 @@
     },
     {
       "inputs": [],
-      "name": "withdrawPremiums",
+      "name": "withdrawBalance",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
+    },
+    {
+      "stateMutability": "payable",
+      "type": "receive"
     }
   ],
-  "bytecode": "0x60806040526001805560405162001806380380620018068339810160408190526200002a9162000123565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a350600382905580516000905b80821015620000d6576000620000ae8484815181106200009a576200009a62000203565b6020026020010151620000e060201b60201c565b6000908152600460205260409020805460ff1916600190811790915592909201915062000076565b5050505062000219565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b80516001600160a01b03811681146200011e57600080fd5b919050565b600080604083850312156200013757600080fd5b8251602080850151919350906001600160401b03808211156200015957600080fd5b818601915086601f8301126200016e57600080fd5b815181811115620001835762000183620000f0565b8060051b604051601f19603f83011681018181108582111715620001ab57620001ab620000f0565b604052918252848201925083810185019189831115620001ca57600080fd5b938501935b82851015620001f357620001e38562000106565b84529385019392850192620001cf565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6115dd80620002296000396000f3fe6080604052600436106100e85760003560e01c80636193cdfb1161008a5780638e2a3d36116100595780638e2a3d36146102f55780639872dbfe1461032757806398a268711461033d578063bfe07da61461037d57600080fd5b80636193cdfb1461026857806372fada5c1461027d5780638da5cb5b1461029d5780638e2749d6146102d557600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101d857806336317972146101ef5780634b2ae9801461020f5780634e1389ed1461024857600080fd5b806303aaf306146100ed57806313af40351461012057806316d7224014610142575b600080fd5b3480156100f957600080fd5b5061010d6101083660046111e7565b610390565b6040519081526020015b60405180910390f35b34801561012c57600080fd5b5061014061013b366004611269565b61053a565b005b34801561014e57600080fd5b5061019f61015d366004611284565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610117565b3480156101e457600080fd5b5060025461010d9081565b3480156101fb57600080fd5b5061014061020a36600461129d565b6105e0565b34801561021b57600080fd5b5061010d61022a366004611269565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025457600080fd5b506101406102633660046112e9565b6106a0565b34801561027457600080fd5b50610140610962565b34801561028957600080fd5b50610140610298366004611284565b6109f2565b3480156102a957600080fd5b506000546102bd906001600160a01b031681565b6040516001600160a01b039091168152602001610117565b3480156102e157600080fd5b506101406102f036600461133c565b610a7a565b34801561030157600080fd5b50610315610310366004611284565b610b76565b6040516101179695949392919061137e565b34801561033357600080fd5b5061010d60035481565b34801561034957600080fd5b5061036d610358366004611284565b60046020526000908152604090205460ff1681565b6040519015158152602001610117565b61010d61038b36600461140c565b610c46565b600061039a610e00565b6103a48383610a7a565b60008881526005602052604090206004810154600160a01b900460ff166103de57604051635972996f60e11b815260040160405180910390fd5b8054851115610400576040516308aeed0f60e21b815260040160405180910390fd5b61040b89868a610e2b565b915060006040518060c001604052808b81526020018881526020018781526020016003544361043a91906114a9565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104d99084906114c1565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061052f60018055565b979650505050505050565b6000546001600160a01b031633146105885760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105e8610e00565b6105f183610eaf565b6105fb8282610a7a565b60008381526005602052604090206004810154600160a01b900460ff1615156001141561062b5761062b846109f2565b600481015481546000835560038301546001600160a01b03928316926106549184911683610eec565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505061069b60018055565b505050565b6106a8610e00565b6000858152600660205260409020600381015443108015906106cc57506002810154155b156106ea576040516331da482760e11b815260040160405180910390fd5b80546000908152600560209081526040808320600280860154925191949361071893918601928b9101611513565b60405160208183030381529060405280519060200120905060008160405160200161076f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107bd57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905261083f9060019060a0016020604051602081039080840390855afa158015610815573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661087157604051632057875960e21b815260040160405180910390fd5b6004840154600186015460028701546001600160a01b0390921691600091610898916114c1565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108dc9083906001600160a01b031683610eec565b60018701541561090757600587015460018801546109079184916001600160a01b0390911690610eec565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061095b60018055565b5050505050565b6000546001600160a01b031633146109ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b604482015260640161057f565b476109b63382610f78565b60408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b6109fb81610eaf565b6000818152600560209081526040918290206004810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556003015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b5a57600060066000868686818110610a9e57610a9e6115ba565b9050602002013581526020019081526020016000209050610abe81610fd3565b6002810154815460009081526005602052604081208054909190610ae39084906114a9565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b3057610b306115ba565b90506020020135604051610b4691815260200190565b60405180910390a282600101925050610a7e565b80821015610b705763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182015460028301805492939192610b9e906114d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610bca906114d8565b8015610c175780601f10610bec57610100808354040283529160200191610c17565b820191906000526020600020905b815481529060010190602001808311610bfa57829003601f168201915b50505050600383015460049093015491926001600160a01b03908116929081169150600160a01b900460ff1686565b6000610c50611006565b9050600085905060006040518060c0016040528087815260200134815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cd0610e00565b60008381526005602090815260409182902083518155818401516001820155918301518051849392610d099260028501929101906110e6565b50606082015160038201805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392831617905560808301516004909201805460a090940151929091167fffffffffffffffffffffff00000000000000000000000000000000000000000090931692909217600160a01b91151591909102179055600280546001019055610d9c82333089611056565b610da560018055565b604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b60015460021415610e245760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610ea85760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600301546001600160a01b03163314610ee9576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b705760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c45440000000000000000000000000000000000604482015260640161057f565b600080600080600085875af190508061069b5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c454400000000000000000000000000604482015260640161057f565b438160030154101580610fe857506002810154155b15610ee95760405163d0404f8560e01b815260040160405180910390fd5b600061101160025490565b600081815260056020526040902060040154909150600160a01b900460ff161515600114156110535760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061095b5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c4544000000000000000000000000604482015260640161057f565b8280546110f2906114d8565b90600052602060002090601f016020900481019282611114576000855561115a565b82601f1061112d57805160ff191683800117855561115a565b8280016001018555821561115a579182015b8281111561115a57825182559160200191906001019061113f565b5061116692915061116a565b5090565b5b80821115611166576000815560010161116b565b80356001600160a01b038116811461119657600080fd5b919050565b60008083601f8401126111ad57600080fd5b50813567ffffffffffffffff8111156111c557600080fd5b6020830191508360208260051b85010111156111e057600080fd5b9250929050565b600080600080600080600060c0888a03121561120257600080fd5b873596506112126020890161117f565b95506112206040890161117f565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124a57600080fd5b6112568a828b0161119b565b989b979a50959850939692959293505050565b60006020828403121561127b57600080fd5b610ea88261117f565b60006020828403121561129657600080fd5b5035919050565b6000806000604084860312156112b257600080fd5b83359250602084013567ffffffffffffffff8111156112d057600080fd5b6112dc8682870161119b565b9497909650939450505050565b600080600080600060a0868803121561130157600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461132e57600080fd5b809150509295509295909350565b6000806020838503121561134f57600080fd5b823567ffffffffffffffff81111561136657600080fd5b6113728582860161119b565b90969095509350505050565b86815260006020878184015260c0604084015286518060c085015260005b818110156113b85788810183015185820160e00152820161139c565b818111156113ca57600060e083870101525b50601f01601f1916830160e00191506113f0905060608301866001600160a01b03169052565b6001600160a01b038416608083015282151560a083015261052f565b6000806000806060858703121561142257600080fd5b61142b8561117f565b935060208501359250604085013567ffffffffffffffff8082111561144f57600080fd5b818701915087601f83011261146357600080fd5b81358181111561147257600080fd5b88602082850101111561148457600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bc576114bc611493565b500190565b6000828210156114d3576114d3611493565b500390565b600181811c908216806114ec57607f821691505b6020821081141561150d57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061152f57607f831692505b602080841082141561154f57634e487b7160e01b86526022600452602486fd5b8180156115635760018114611574576115a1565b60ff198616895284890196506115a1565b60008c81526020902060005b868110156115995781548b820152908501908301611580565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
-  "deployedBytecode": "0x6080604052600436106100e85760003560e01c80636193cdfb1161008a5780638e2a3d36116100595780638e2a3d36146102f55780639872dbfe1461032757806398a268711461033d578063bfe07da61461037d57600080fd5b80636193cdfb1461026857806372fada5c1461027d5780638da5cb5b1461029d5780638e2749d6146102d557600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101d857806336317972146101ef5780634b2ae9801461020f5780634e1389ed1461024857600080fd5b806303aaf306146100ed57806313af40351461012057806316d7224014610142575b600080fd5b3480156100f957600080fd5b5061010d6101083660046111e7565b610390565b6040519081526020015b60405180910390f35b34801561012c57600080fd5b5061014061013b366004611269565b61053a565b005b34801561014e57600080fd5b5061019f61015d366004611284565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610117565b3480156101e457600080fd5b5060025461010d9081565b3480156101fb57600080fd5b5061014061020a36600461129d565b6105e0565b34801561021b57600080fd5b5061010d61022a366004611269565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025457600080fd5b506101406102633660046112e9565b6106a0565b34801561027457600080fd5b50610140610962565b34801561028957600080fd5b50610140610298366004611284565b6109f2565b3480156102a957600080fd5b506000546102bd906001600160a01b031681565b6040516001600160a01b039091168152602001610117565b3480156102e157600080fd5b506101406102f036600461133c565b610a7a565b34801561030157600080fd5b50610315610310366004611284565b610b76565b6040516101179695949392919061137e565b34801561033357600080fd5b5061010d60035481565b34801561034957600080fd5b5061036d610358366004611284565b60046020526000908152604090205460ff1681565b6040519015158152602001610117565b61010d61038b36600461140c565b610c46565b600061039a610e00565b6103a48383610a7a565b60008881526005602052604090206004810154600160a01b900460ff166103de57604051635972996f60e11b815260040160405180910390fd5b8054851115610400576040516308aeed0f60e21b815260040160405180910390fd5b61040b89868a610e2b565b915060006040518060c001604052808b81526020018881526020018781526020016003544361043a91906114a9565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104d99084906114c1565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061052f60018055565b979650505050505050565b6000546001600160a01b031633146105885760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105e8610e00565b6105f183610eaf565b6105fb8282610a7a565b60008381526005602052604090206004810154600160a01b900460ff1615156001141561062b5761062b846109f2565b600481015481546000835560038301546001600160a01b03928316926106549184911683610eec565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a250505061069b60018055565b505050565b6106a8610e00565b6000858152600660205260409020600381015443108015906106cc57506002810154155b156106ea576040516331da482760e11b815260040160405180910390fd5b80546000908152600560209081526040808320600280860154925191949361071893918601928b9101611513565b60405160208183030381529060405280519060200120905060008160405160200161076f91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107bd57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff881692820192909252606081018990526080810188905261083f9060019060a0016020604051602081039080840390855afa158015610815573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661087157604051632057875960e21b815260040160405180910390fd5b6004840154600186015460028701546001600160a01b0390921691600091610898916114c1565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108dc9083906001600160a01b031683610eec565b60018701541561090757600587015460018801546109079184916001600160a01b0390911690610eec565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061095b60018055565b5050505050565b6000546001600160a01b031633146109ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b604482015260640161057f565b476109b63382610f78565b60408051338152602081018390527fbf0d92faf65e256806eefa1a0d281d4873cc3c80d1ed25b8ae6f7cc66fc918ef910160405180910390a150565b6109fb81610eaf565b6000818152600560209081526040918290206004810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556003015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b5a57600060066000868686818110610a9e57610a9e6115ba565b9050602002013581526020019081526020016000209050610abe81610fd3565b6002810154815460009081526005602052604081208054909190610ae39084906114a9565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b3057610b306115ba565b90506020020135604051610b4691815260200190565b60405180910390a282600101925050610a7e565b80821015610b705763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182015460028301805492939192610b9e906114d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610bca906114d8565b8015610c175780601f10610bec57610100808354040283529160200191610c17565b820191906000526020600020905b815481529060010190602001808311610bfa57829003601f168201915b50505050600383015460049093015491926001600160a01b03908116929081169150600160a01b900460ff1686565b6000610c50611006565b9050600085905060006040518060c0016040528087815260200134815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cd0610e00565b60008381526005602090815260409182902083518155818401516001820155918301518051849392610d099260028501929101906110e6565b50606082015160038201805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392831617905560808301516004909201805460a090940151929091167fffffffffffffffffffffff00000000000000000000000000000000000000000090931692909217600160a01b91151591909102179055600280546001019055610d9c82333089611056565b610da560018055565b604080518481526001600160a01b0389166020820152348183015260608101889052905133917fe0cfbec12278e314697ee34bb7a1ba4d704e84c438680672f7c1175f287e5910919081900360800190a25050949350505050565b60015460021415610e245760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610ea85760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600301546001600160a01b03163314610ee9576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b705760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c45440000000000000000000000000000000000604482015260640161057f565b600080600080600085875af190508061069b5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c454400000000000000000000000000604482015260640161057f565b438160030154101580610fe857506002810154155b15610ee95760405163d0404f8560e01b815260040160405180910390fd5b600061101160025490565b600081815260056020526040902060040154909150600160a01b900460ff161515600114156110535760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061095b5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c4544000000000000000000000000604482015260640161057f565b8280546110f2906114d8565b90600052602060002090601f016020900481019282611114576000855561115a565b82601f1061112d57805160ff191683800117855561115a565b8280016001018555821561115a579182015b8281111561115a57825182559160200191906001019061113f565b5061116692915061116a565b5090565b5b80821115611166576000815560010161116b565b80356001600160a01b038116811461119657600080fd5b919050565b60008083601f8401126111ad57600080fd5b50813567ffffffffffffffff8111156111c557600080fd5b6020830191508360208260051b85010111156111e057600080fd5b9250929050565b600080600080600080600060c0888a03121561120257600080fd5b873596506112126020890161117f565b95506112206040890161117f565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124a57600080fd5b6112568a828b0161119b565b989b979a50959850939692959293505050565b60006020828403121561127b57600080fd5b610ea88261117f565b60006020828403121561129657600080fd5b5035919050565b6000806000604084860312156112b257600080fd5b83359250602084013567ffffffffffffffff8111156112d057600080fd5b6112dc8682870161119b565b9497909650939450505050565b600080600080600060a0868803121561130157600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461132e57600080fd5b809150509295509295909350565b6000806020838503121561134f57600080fd5b823567ffffffffffffffff81111561136657600080fd5b6113728582860161119b565b90969095509350505050565b86815260006020878184015260c0604084015286518060c085015260005b818110156113b85788810183015185820160e00152820161139c565b818111156113ca57600060e083870101525b50601f01601f1916830160e00191506113f0905060608301866001600160a01b03169052565b6001600160a01b038416608083015282151560a083015261052f565b6000806000806060858703121561142257600080fd5b61142b8561117f565b935060208501359250604085013567ffffffffffffffff8082111561144f57600080fd5b818701915087601f83011261146357600080fd5b81358181111561147257600080fd5b88602082850101111561148457600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bc576114bc611493565b500190565b6000828210156114d3576114d3611493565b500390565b600181811c908216806114ec57607f821691505b6020821081141561150d57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061152f57607f831692505b602080841082141561154f57634e487b7160e01b86526022600452602486fd5b8180156115635760018114611574576115a1565b60ff198616895284890196506115a1565b60008c81526020902060005b868110156115995781548b820152908501908301611580565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
+  "bytecode": "0x60806040526001805560405162001807380380620018078339810160408190526200002a9162000123565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a350600382905580516000905b80821015620000d6576000620000ae8484815181106200009a576200009a62000203565b6020026020010151620000e060201b60201c565b6000908152600460205260409020805460ff1916600190811790915592909201915062000076565b5050505062000219565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b80516001600160a01b03811681146200011e57600080fd5b919050565b600080604083850312156200013757600080fd5b8251602080850151919350906001600160401b03808211156200015957600080fd5b818601915086601f8301126200016e57600080fd5b815181811115620001835762000183620000f0565b8060051b604051601f19603f83011681018181108582111715620001ab57620001ab620000f0565b604052918252848201925083810185019189831115620001ca57600080fd5b938501935b82851015620001f357620001e38562000106565b84529385019392850192620001cf565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6115de80620002296000396000f3fe6080604052600436106100ec5760003560e01c80635fd8c7101161008a5780638e2a3d36116100595780638e2a3d36146103005780639872dbfe1461033157806398a2687114610347578063bfe07da61461038757600080fd5b80635fd8c7101461027357806372fada5c146102885780638da5cb5b146102a85780638e2749d6146102e057600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101e357806336317972146101fa5780634b2ae9801461021a5780634e1389ed1461025357600080fd5b806303aaf306146100f857806313af40351461012b57806316d722401461014d57600080fd5b366100f357005b600080fd5b34801561010457600080fd5b506101186101133660046111e9565b6103a7565b6040519081526020015b60405180910390f35b34801561013757600080fd5b5061014b61014636600461126b565b610551565b005b34801561015957600080fd5b506101aa610168366004611286565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610122565b3480156101ef57600080fd5b506002546101189081565b34801561020657600080fd5b5061014b61021536600461129f565b6105f7565b34801561022657600080fd5b5061011861023536600461126b565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025f57600080fd5b5061014b61026e3660046112eb565b6106b7565b34801561027f57600080fd5b5061014b61097a565b34801561029457600080fd5b5061014b6102a3366004611286565b610a0a565b3480156102b457600080fd5b506000546102c8906001600160a01b031681565b6040516001600160a01b039091168152602001610122565b3480156102ec57600080fd5b5061014b6102fb36600461133e565b610a92565b34801561030c57600080fd5b5061032061031b366004611286565b610b8e565b604051610122959493929190611380565b34801561033d57600080fd5b5061011860035481565b34801561035357600080fd5b50610377610362366004611286565b60046020526000908152604090205460ff1681565b6040519015158152602001610122565b34801561039357600080fd5b506101186103a236600461140d565b610c58565b60006103b1610e02565b6103bb8383610a92565b60008881526005602052604090206003810154600160a01b900460ff166103f557604051635972996f60e11b815260040160405180910390fd5b8054851115610417576040516308aeed0f60e21b815260040160405180910390fd5b61042289868a610e2d565b915060006040518060c001604052808b81526020018881526020018781526020016003544361045191906114aa565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104f09084906114c2565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061054660018055565b979650505050505050565b6000546001600160a01b0316331461059f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105ff610e02565b61060883610eb1565b6106128282610a92565b60008381526005602052604090206003810154600160a01b900460ff161515600114156106425761064284610a0a565b600381015481546000835560028301546001600160a01b039283169261066b9184911683610eee565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506106b260018055565b505050565b6106bf610e02565b60008581526006602052604090206003810154431015806106e257506002810154155b15610700576040516331da482760e11b815260040160405180910390fd5b805460009081526005602090815260408083206002850154915190939261073092600186019290918b9101611514565b60405160208183030381529060405280519060200120905060008160405160200161078791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107d557604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff88169282019290925260608101899052608081018890526108579060019060a0016020604051602081039080840390855afa15801561082d573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661088957604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b03909216916000916108b0916114c2565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108f49083906001600160a01b031683610eee565b60018701541561091f576005870154600188015461091f9184916001600160a01b0390911690610eee565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061097360018055565b5050505050565b6000546001600160a01b031633146109c35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610596565b476109ce3382610f7a565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910160405180910390a150565b610a1381610eb1565b6000818152600560209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b7257600060066000868686818110610ab657610ab66115bb565b9050602002013581526020019081526020016000209050610ad681610fd5565b6002810154815460009081526005602052604081208054909190610afb9084906114aa565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b4857610b486115bb565b90506020020135604051610b5e91815260200190565b60405180910390a282600101925050610a96565b80821015610b885763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182018054919291610bb0906114d9565b80601f0160208091040260200160405190810160405280929190818152602001828054610bdc906114d9565b8015610c295780601f10610bfe57610100808354040283529160200191610c29565b820191906000526020600020905b815481529060010190602001808311610c0c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000610c62611008565b9050600085905060006040518060a0016040528087815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cdc610e02565b6000838152600560209081526040909120825181558183015180518493610d0a9260018501929101906110e8565b506040820151600280830180546001600160a01b0393841673ffffffffffffffffffffffffffffffffffffffff199091161790556060840151600390930180546080909501511515600160a01b027fffffffffffffffffffffff000000000000000000000000000000000000000000909516939092169290921792909217909155610d989080546001019055565b610da482333089611058565b610dad60018055565b604080518481526001600160a01b038916602082015290810187905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a25050949350505050565b60015460021415610e265760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610eaa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600201546001600160a01b03163314610eeb576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b885760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610596565b600080600080600085875af19050806106b25760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610596565b438160030154101580610fea57506002810154155b15610eeb5760405163d0404f8560e01b815260040160405180910390fd5b600061101360025490565b600081815260056020526040902060030154909150600160a01b900460ff161515600114156110555760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806109735760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610596565b8280546110f4906114d9565b90600052602060002090601f016020900481019282611116576000855561115c565b82601f1061112f57805160ff191683800117855561115c565b8280016001018555821561115c579182015b8281111561115c578251825591602001919060010190611141565b5061116892915061116c565b5090565b5b80821115611168576000815560010161116d565b80356001600160a01b038116811461119857600080fd5b919050565b60008083601f8401126111af57600080fd5b50813567ffffffffffffffff8111156111c757600080fd5b6020830191508360208260051b85010111156111e257600080fd5b9250929050565b600080600080600080600060c0888a03121561120457600080fd5b8735965061121460208901611181565b955061122260408901611181565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124c57600080fd5b6112588a828b0161119d565b989b979a50959850939692959293505050565b60006020828403121561127d57600080fd5b610eaa82611181565b60006020828403121561129857600080fd5b5035919050565b6000806000604084860312156112b457600080fd5b83359250602084013567ffffffffffffffff8111156112d257600080fd5b6112de8682870161119d565b9497909650939450505050565b600080600080600060a0868803121561130357600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461133057600080fd5b809150509295509295909350565b6000806020838503121561135157600080fd5b823567ffffffffffffffff81111561136857600080fd5b6113748582860161119d565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156113b45788810183015185820160c001528201611398565b818111156113c657600060c083870101525b50601f01601f1916830160c00191506113ec905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806000806060858703121561142357600080fd5b61142c85611181565b935060208501359250604085013567ffffffffffffffff8082111561145057600080fd5b818701915087601f83011261146457600080fd5b81358181111561147357600080fd5b88602082850101111561148557600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bd576114bd611494565b500190565b6000828210156114d4576114d4611494565b500390565b600181811c908216806114ed57607f821691505b6020821081141561150e57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061153057607f831692505b602080841082141561155057634e487b7160e01b86526022600452602486fd5b8180156115645760018114611575576115a2565b60ff198616895284890196506115a2565b60008c81526020902060005b8681101561159a5781548b820152908501908301611581565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
+  "deployedBytecode": "0x6080604052600436106100ec5760003560e01c80635fd8c7101161008a5780638e2a3d36116100595780638e2a3d36146103005780639872dbfe1461033157806398a2687114610347578063bfe07da61461038757600080fd5b80635fd8c7101461027357806372fada5c146102885780638da5cb5b146102a85780638e2749d6146102e057600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101e357806336317972146101fa5780634b2ae9801461021a5780634e1389ed1461025357600080fd5b806303aaf306146100f857806313af40351461012b57806316d722401461014d57600080fd5b366100f357005b600080fd5b34801561010457600080fd5b506101186101133660046111e9565b6103a7565b6040519081526020015b60405180910390f35b34801561013757600080fd5b5061014b61014636600461126b565b610551565b005b34801561015957600080fd5b506101aa610168366004611286565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610122565b3480156101ef57600080fd5b506002546101189081565b34801561020657600080fd5b5061014b61021536600461129f565b6105f7565b34801561022657600080fd5b5061011861023536600461126b565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025f57600080fd5b5061014b61026e3660046112eb565b6106b7565b34801561027f57600080fd5b5061014b61097a565b34801561029457600080fd5b5061014b6102a3366004611286565b610a0a565b3480156102b457600080fd5b506000546102c8906001600160a01b031681565b6040516001600160a01b039091168152602001610122565b3480156102ec57600080fd5b5061014b6102fb36600461133e565b610a92565b34801561030c57600080fd5b5061032061031b366004611286565b610b8e565b604051610122959493929190611380565b34801561033d57600080fd5b5061011860035481565b34801561035357600080fd5b50610377610362366004611286565b60046020526000908152604090205460ff1681565b6040519015158152602001610122565b34801561039357600080fd5b506101186103a236600461140d565b610c58565b60006103b1610e02565b6103bb8383610a92565b60008881526005602052604090206003810154600160a01b900460ff166103f557604051635972996f60e11b815260040160405180910390fd5b8054851115610417576040516308aeed0f60e21b815260040160405180910390fd5b61042289868a610e2d565b915060006040518060c001604052808b81526020018881526020018781526020016003544361045191906114aa565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104f09084906114c2565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061054660018055565b979650505050505050565b6000546001600160a01b0316331461059f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105ff610e02565b61060883610eb1565b6106128282610a92565b60008381526005602052604090206003810154600160a01b900460ff161515600114156106425761064284610a0a565b600381015481546000835560028301546001600160a01b039283169261066b9184911683610eee565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506106b260018055565b505050565b6106bf610e02565b60008581526006602052604090206003810154431015806106e257506002810154155b15610700576040516331da482760e11b815260040160405180910390fd5b805460009081526005602090815260408083206002850154915190939261073092600186019290918b9101611514565b60405160208183030381529060405280519060200120905060008160405160200161078791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107d557604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff88169282019290925260608101899052608081018890526108579060019060a0016020604051602081039080840390855afa15801561082d573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661088957604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b03909216916000916108b0916114c2565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108f49083906001600160a01b031683610eee565b60018701541561091f576005870154600188015461091f9184916001600160a01b0390911690610eee565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061097360018055565b5050505050565b6000546001600160a01b031633146109c35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610596565b476109ce3382610f7a565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910160405180910390a150565b610a1381610eb1565b6000818152600560209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b7257600060066000868686818110610ab657610ab66115bb565b9050602002013581526020019081526020016000209050610ad681610fd5565b6002810154815460009081526005602052604081208054909190610afb9084906114aa565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b4857610b486115bb565b90506020020135604051610b5e91815260200190565b60405180910390a282600101925050610a96565b80821015610b885763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182018054919291610bb0906114d9565b80601f0160208091040260200160405190810160405280929190818152602001828054610bdc906114d9565b8015610c295780601f10610bfe57610100808354040283529160200191610c29565b820191906000526020600020905b815481529060010190602001808311610c0c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000610c62611008565b9050600085905060006040518060a0016040528087815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cdc610e02565b6000838152600560209081526040909120825181558183015180518493610d0a9260018501929101906110e8565b506040820151600280830180546001600160a01b0393841673ffffffffffffffffffffffffffffffffffffffff199091161790556060840151600390930180546080909501511515600160a01b027fffffffffffffffffffffff000000000000000000000000000000000000000000909516939092169290921792909217909155610d989080546001019055565b610da482333089611058565b610dad60018055565b604080518481526001600160a01b038916602082015290810187905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a25050949350505050565b60015460021415610e265760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610eaa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600201546001600160a01b03163314610eeb576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b885760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610596565b600080600080600085875af19050806106b25760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610596565b438160030154101580610fea57506002810154155b15610eeb5760405163d0404f8560e01b815260040160405180910390fd5b600061101360025490565b600081815260056020526040902060030154909150600160a01b900460ff161515600114156110555760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806109735760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610596565b8280546110f4906114d9565b90600052602060002090601f016020900481019282611116576000855561115c565b82601f1061112f57805160ff191683800117855561115c565b8280016001018555821561115c579182015b8281111561115c578251825591602001919060010190611141565b5061116892915061116c565b5090565b5b80821115611168576000815560010161116d565b80356001600160a01b038116811461119857600080fd5b919050565b60008083601f8401126111af57600080fd5b50813567ffffffffffffffff8111156111c757600080fd5b6020830191508360208260051b85010111156111e257600080fd5b9250929050565b600080600080600080600060c0888a03121561120457600080fd5b8735965061121460208901611181565b955061122260408901611181565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124c57600080fd5b6112588a828b0161119d565b989b979a50959850939692959293505050565b60006020828403121561127d57600080fd5b610eaa82611181565b60006020828403121561129857600080fd5b5035919050565b6000806000604084860312156112b457600080fd5b83359250602084013567ffffffffffffffff8111156112d257600080fd5b6112de8682870161119d565b9497909650939450505050565b600080600080600060a0868803121561130357600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461133057600080fd5b809150509295509295909350565b6000806020838503121561135157600080fd5b823567ffffffffffffffff81111561136857600080fd5b6113748582860161119d565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156113b45788810183015185820160c001528201611398565b818111156113c657600060c083870101525b50601f01601f1916830160c00191506113ec905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806000806060858703121561142357600080fd5b61142c85611181565b935060208501359250604085013567ffffffffffffffff8082111561145057600080fd5b818701915087601f83011261146457600080fd5b81358181111561147357600080fd5b88602082850101111561148557600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bd576114bd611494565b500190565b6000828210156114d4576114d4611494565b500390565b600181811c908216806114ed57607f821691505b6020821081141561150e57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061153057607f831692505b602080841082141561155057634e487b7160e01b86526022600452602486fd5b8180156115645760018114611575576115a2565b60ff198616895284890196506115a2565b60008c81526020902060005b8681101561159a5781548b820152908501908301611581565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 8ea3c70..f9055dc 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -2,6 +2,12 @@
 import SearchComponent from "../components/SearchComponent.vue";
 import blockchain from "../utils/blockchain";
 
+// (TO DO) Tirar isso tudo daqui
+import p2pix from "../utils/smart_contract_files/P2PIX.json";
+import addresses from "../utils/smart_contract_files/localhost.json";
+import { useEtherStore } from "@/store/ether";
+import { ethers } from "ethers";
+
 const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
   // finish buy screen
   console.log(selectedDeposit);
@@ -11,6 +17,31 @@ const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
     .then((deposit) => (depositDetail = deposit));
   console.log(tokenValue);
   console.log(depositDetail);
+
+  // Makes lock with deposit ID and the Amount
+  if (depositDetail){
+    const lock = await blockchain.addLock(depositDetail.args.depositID, tokenValue);
+    console.log(lock);
+
+    // (TO DO) Tirar isso daqui
+    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 etherStore = useEtherStore();
+    const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+    const filterLocks = p2pContract.filters.LockAdded(null);
+    const eventsLocks = await p2pContract.queryFilter(filterLocks);
+    etherStore.setLocksAddedList(eventsLocks);
+
+    // Data to QRCode
+    // Chave Pix = depositDetail.pixTarget
+    // Valor = tokenValue
+
+  }
+  
 };
 </script>
 
diff --git a/src/views/MockView.vue b/src/views/MockView.vue
index 68ab74f..b958d43 100644
--- a/src/views/MockView.vue
+++ b/src/views/MockView.vue
@@ -5,38 +5,59 @@ import { ref } from "vue";
 import { useEtherStore } from "../store/ether";
 import blockchain from "../utils/blockchain";
 
+// Blockchain Data
 const etherStore = useEtherStore();
+const { depositsAddedList } = storeToRefs(etherStore);
+const { locksAddedList } = storeToRefs(etherStore);
 
-const { depositList } = storeToRefs(etherStore);
-
+// Buyer's flow Data
 const depositValue = ref<Number>();
 const depositPixKey = ref<string>("");
 
+//  Split tokens between wallets in wallets.json
 const splitTokens = () => {
   blockchain.splitTokens();
 };
 
+// Formatting methods
+// Formats wallet address in 0x000...0000 format
+const formatWalletAddress = (wallet: string): string => {
+  const walletAddressLength = wallet.length;
+  const initialText = wallet.substring(0, 5);
+  const finalText = wallet.substring(
+    walletAddressLength - 4,
+    walletAddressLength
+  );
+  return `${initialText}...${finalText}`;
+};
+
+// Deposit methods
+// Gets value and pix key from user's form to create a deposit in the blockchain
 const mockDeposit = () => {
   if (!depositValue.value || !depositPixKey.value) return;
-  blockchain.mockDeposit(depositValue.value.toString(), depositPixKey.value);
-};
-
-const countDeposit = () => {
-  blockchain.countDeposit();
+  blockchain.addDeposit(depositValue.value.toString(), depositPixKey.value);
 };
 
+// Get specific deposit data by its ID
 const mapDeposit = (depositId: BigNumber) => {
   blockchain.mapDeposits(depositId);
 };
+
+// Lock methods
+// (TO DO) Releases lock by specific ID and other additional data
+const releaseLock = () => {
+  blockchain.releaseLock();
+};
+
+// Get specific lock data by its ID
+const mapLock = (lockId: string) => {
+  blockchain.mapLocks(lockId);
+};
 </script>
 
 <template>
   <div class="page">
     <div class="flex flex-col gap-4 justify-start items-start w-2/3">
-      <button type="button" class="default-button" @click="countDeposit()">
-        Contar depósitos
-      </button>
-
       <div class="flex gap-4 w-full justify-between">
         <input
           type="number"
@@ -60,17 +81,32 @@ const mapDeposit = (depositId: BigNumber) => {
       <button type="button" class="default-button" @click="splitTokens()">
         Dividir tokens
       </button>
+
+      <button type="button" class="default-button" @click="releaseLock()">
+        Release Lock
+      </button>
     </div>
 
     <ul class="flex flex-col justify-center items-center gap-4">
       <li
         class="text-gray-900 font-semibold text-lg cursor-pointer border-2 border-amber-400 p-2 rounded-md bg-amber-200"
-        v-for="deposit in depositList"
-        :key="deposit['blockNumber']"
-        @click="mapDeposit(deposit['args']['depositID'])"
+        v-for="deposit in depositsAddedList"
+        :key="deposit.blockNumber"
+        @click="mapDeposit(deposit.args.depositID)"
       >
-        Address:<br />{{ deposit["args"]["0"] }}<br />
-        MRBZ: {{ blockchain.formatEther(deposit["args"]["amount"]) }}
+        Seller:<br />{{ formatWalletAddress(deposit.args.seller) }}<br />
+        MRBZ: {{ blockchain.formatEther(deposit.args.amount) }}
+      </li>
+    </ul>
+    <ul class="flex flex-col justify-center items-center gap-4">
+      <li
+        class="text-gray-900 font-semibold text-lg cursor-pointer border-2 border-amber-400 p-2 rounded-md bg-amber-200"
+        v-for="lock in locksAddedList"
+        :key="lock.blockNumber"
+        @click="mapLock(lock.args.lockID)"
+      >
+        Buyer:<br />{{ formatWalletAddress(lock.args.buyer) }}<br />
+        MRBZ: {{ blockchain.formatEther(lock.args.amount) }}
       </li>
     </ul>
   </div>

From 295afb58e2874a397168723cf1dc6aba2e8cef27 Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Sun, 4 Dec 2022 15:34:06 -0300
Subject: [PATCH 20/20] Fixing lint

---
 src/components/SearchComponent.vue | 12 ++++++------
 src/utils/blockchain.ts            | 20 +++++++++-----------
 src/views/HomeView.vue             |  9 +++++----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index fd794b5..5cff2b8 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -59,10 +59,8 @@ const verifyLiquidity = () => {
 
   if (!walletAddress.value || tokenValue.value <= 0) return;
 
-  const found = depositsAddedList.value.find((element) => {
-    const p2pixTokenValue = blockchain.formatBigNumber(
-      element.args.amount
-    );
+  depositsAddedList.value.find((element) => {
+    const p2pixTokenValue = blockchain.formatBigNumber(element.args.amount);
     if (
       tokenValue.value!! <= Number(p2pixTokenValue) &&
       tokenValue.value!! != 0 &&
@@ -71,7 +69,10 @@ const verifyLiquidity = () => {
       enableSelectButton.value = true;
       hasLiquidity.value = true;
       selectedDeposit.value = element;
-      console.log("Selected is :", blockchain.formatBigNumber(element.args.amount))
+      console.log(
+        "Selected is :",
+        blockchain.formatBigNumber(element.args.amount)
+      );
       return true;
     }
     return false;
@@ -81,7 +82,6 @@ const verifyLiquidity = () => {
     hasLiquidity.value = false;
   }
 };
-
 </script>
 
 <template>
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index 4a49614..246f8b6 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -18,7 +18,11 @@ const connectProvider = async () => {
   if (!connection) return;
   provider = new ethers.providers.Web3Provider(connection);
   const signer = provider.getSigner();
-  const tokenContract = new ethers.Contract(addresses.token, mockToken.abi, signer);
+  const tokenContract = new ethers.Contract(
+    addresses.token,
+    mockToken.abi,
+    signer
+  );
 
   const walletAddress = await provider.send("eth_requestAccounts", []);
   const balance = await tokenContract.balanceOf(walletAddress[0]);
@@ -35,7 +39,7 @@ const connectProvider = async () => {
 
   const filterLocks = p2pEvents.filters.LockAdded(null);
   const eventsLocks = await p2pEvents.queryFilter(filterLocks);
-  console.log("Locks Added: ", eventsLocks)
+  console.log("Locks Added: ", eventsLocks);
   etherStore.setLocksAddedList(eventsLocks);
 
   const filterExpiredLocks = p2pEvents.filters.LockReturned(null);
@@ -149,7 +153,7 @@ const mapDeposits = async (depositId: BigNumber) => {
 
 // Lock methods
 // Gets value from user's form to create a lock in the blockchain
-const addLock = async(depositId: Number, amount: Number) => {
+const addLock = async (depositId: Number, amount: Number) => {
   const etherStore = useEtherStore();
   const provider = getProvider();
 
@@ -158,7 +162,7 @@ const addLock = async(depositId: Number, amount: Number) => {
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
   // Make lock
-  const lockTx = await p2pContract.lock(
+  await p2pContract.lock(
     depositId,
     etherStore.walletAddress,
     ethers.constants.AddressZero,
@@ -170,12 +174,6 @@ const addLock = async(depositId: Number, amount: Number) => {
   const filterLocks = p2pContract.filters.LockAdded(null);
   const eventsLocks = await p2pContract.queryFilter(filterLocks);
   etherStore.setLocksAddedList(eventsLocks);
-
-  {
-
-    
-  }
-
 };
 
 // Get specific lock data by its ID
@@ -194,7 +192,7 @@ const mapLocks = async (lockId: string) => {
 
 // Releases lock by specific ID and other additional data
 // (TO DO)
-const releaseLock = async() => {
+const releaseLock = async () => {
   return;
 };
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index f9055dc..2ee8a58 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -19,8 +19,11 @@ const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
   console.log(depositDetail);
 
   // Makes lock with deposit ID and the Amount
-  if (depositDetail){
-    const lock = await blockchain.addLock(depositDetail.args.depositID, tokenValue);
+  if (depositDetail) {
+    const lock = await blockchain.addLock(
+      depositDetail.args.depositID,
+      tokenValue
+    );
     console.log(lock);
 
     // (TO DO) Tirar isso daqui
@@ -39,9 +42,7 @@ const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
     // Data to QRCode
     // Chave Pix = depositDetail.pixTarget
     // Valor = tokenValue
-
   }
-  
 };
 </script>