From 122711e4d67436670502f0b95a96a21750e05934 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Tue, 24 Oct 2023 20:45:24 -0400
Subject: [PATCH 1/2] Push branch

---
 .../overview/components/BreakdownTable.vue    | 806 ++++++++----------
 .../ethereum/scripts/resources/ssv-network    |   1 +
 .../oracle/scripts/resources/rockx-dkg-cli    |   1 +
 3 files changed, 348 insertions(+), 460 deletions(-)
 create mode 160000 contracts/ethereum/scripts/resources/ssv-network
 create mode 160000 services/oracle/scripts/resources/rockx-dkg-cli

diff --git a/apps/web/src/pages/overview/components/BreakdownTable.vue b/apps/web/src/pages/overview/components/BreakdownTable.vue
index e1a18d1df..500d91736 100644
--- a/apps/web/src/pages/overview/components/BreakdownTable.vue
+++ b/apps/web/src/pages/overview/components/BreakdownTable.vue
@@ -57,25 +57,33 @@ const tableHeaderOptions = ref(
           value: 'blank_column'
         },
         {
-          title: 'Date',
-          value: 'date'
+          title: 'Hash',
+          value: 'tx_hash'
         },
         {
           title: 'Type',
           value: 'tx_type'
         },
+        {
+          title: 'Date',
+          value: 'date'
+        },
         {
           title: 'Amount',
           value: 'stk_amt'
         },
         {
-          title: 'Status',
-          value: 'status'
+          title: 'Price',
+          value: 'price'
         },
         {
-          title: 'Hash',
-          value: 'tx_hash'
-        }
+          title: 'From',
+          value: 'from'
+        },
+        {
+          title: 'To',
+          value: 'to'
+        },
       ]
     },
     Staking: {
@@ -89,8 +97,8 @@ const tableHeaderOptions = ref(
           value: 'date'
         },
         {
-          title: 'Account',
-          value: 'act'
+          title: 'Wallet Address',
+          value: 'wallet_address'
         },
         {
           title: 'Type',
@@ -101,8 +109,8 @@ const tableHeaderOptions = ref(
           value: 'amount'
         },
         {
-          title: 'Staking Fees',
-          value: 'staking_fees'
+          title: 'Fees',
+          value: 'fees'
         },
         {
           title: 'Status',
@@ -117,12 +125,12 @@ const tableHeaderOptions = ref(
   }
 )
 
-const {  user } = useUser()
+const { user } = useUser()
 
 const tableData = ref({
-  Wallets: [] as {tx_hash: string, wallet_provider: string,  status: string, staking_fees: string, type: string, amount: string, bal: string,  act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
-  Transactions: [] as {tx_hash: string, wallet_provider: string,  status: string, staking_fees: string, type: string, amount: string, bal: string,  act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
-  Staking: [] as {tx_hash: string, wallet_provider: string,  status: string, staking_fees: string, type: string, amount: string, bal: string,  act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
+  Wallets: [] as { tx_hash: string, wallet_provider: string, status: string, staking_fees: string, type: string, amount: string, bal: string, act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
+  Transactions: [] as { tx_hash: string, wallet_provider: string, status: string, staking_fees: string, type: string, amount: string, bal: string, act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
+  Staking: [] as { tx_hash: string, wallet_provider: string, status: string, staking_fees: string, type: string, amount: string, bal: string, act: string, date: string, blank_column: any, stk_amt: string, tx_type: string, stk_rwd: string }[],
 })
 
 const filteredData = ref(tableData.value[tableView.value as keyof typeof tableData.value])
@@ -130,33 +138,35 @@ const filteredData = ref(tableData.value[tableView.value as keyof typeof tableDa
 const filterData = () => {
   let filteredDataArray
 
+  filteredDataArray = tableData.value[tableView.value as keyof typeof tableData.value]
   if (searchInput.value === '') {
     filteredDataArray = tableData.value[tableView.value as keyof typeof tableData.value]
   } else {
     const searchTerm = searchInput.value.toLocaleLowerCase()
     filteredDataArray = (tableData.value[tableView.value as keyof typeof tableData.value] as Array<any>).filter(item => {
-      return (
-        // Might need to modify to match types each variable
-        // {tx_hash: string, wallet_provider: string,  status: string, 
-        // staking_fees: string, type: string, amount: string, bal: string,
-        // act: string, date: string, blank_column: any, stk_amt: string, 
-        // tx_type: string, stk_rwd: string }
-        item.wallet_provider?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.act?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.bal?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.stk_amt?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.stk_rwd?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.tx_hash?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.date?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.apy?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.status?.toString().toLocaleLowerCase().includes(searchTerm) || 
-        item.type?.toString().toLocaleLowerCase().includes(searchTerm) ||
-        item.staking_fees?.toString().toLocaleLowerCase().includes(searchTerm)
-      )
+      return true
+      // return (
+      // Might need to modify to match types each variable
+      // {tx_hash: string, wallet_provider: string,  status: string, 
+      // staking_fees: string, type: string, amount: string, bal: string,
+      // act: string, date: string, blank_column: any, stk_amt: string, 
+      // tx_type: string, stk_rwd: string }
+      // item.wallet_provider?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.act?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.bal?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.stk_amt?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.stk_rwd?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.tx_hash?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.date?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.apy?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.status?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.type?.toString().toLocaleLowerCase().includes(searchTerm) ||
+      // item.staking_fees?.toString().toLocaleLowerCase().includes(searchTerm)
+      // )
     })
   }
 
-  if(selectedHeader.value !== '' && selectedOrientation.value !== '') {
+  if (selectedHeader.value !== '' && selectedOrientation.value !== '') {
     filteredDataArray = filteredDataArray.sort((a, b) => {
       const valA = a[selectedHeader.value]
       const valB = b[selectedHeader.value]
@@ -175,7 +185,7 @@ const filterData = () => {
   filteredData.value = filteredDataArray.slice(start, end) as any
 }
 
-watch([searchInput, tableView, selectedHeader, selectedOrientation, currentPage], ()=>{
+watch([searchInput, tableView, selectedHeader, selectedOrientation, currentPage], () => {
   filterData()
 })
 
@@ -228,7 +238,7 @@ const downloadFile = (content: any, filename: string, mimeType: any) => {
 
 const exportFile = () => {
 
-  const jsonData = checkedItems.value.length > 0? checkedItems.value : filteredData.value
+  const jsonData = checkedItems.value.length > 0 ? checkedItems.value : filteredData.value
 
   const isMac = navigator.userAgent.indexOf('Mac') !== -1
   const fileExtension = isMac ? 'csv' : 'xlsx'
@@ -242,19 +252,19 @@ const exportFile = () => {
   }
 }
 
-const removeItemFromCheckedList = (item:any) => {
+const removeItemFromCheckedList = (item: any) => {
   const index = checkedItems.value.indexOf(item)
   if (index > -1) {
     checkedItems.value.splice(index, 1)
   }
 }
 
-const {rawUserAnalytics } = useAnalytics()
+const { rawUserAnalytics } = useAnalytics()
 
 
-const setTableData = () =>{
+const setTableData = () => {
 
-  if(!rawUserAnalytics.value) return 
+  if (!rawUserAnalytics.value) return
 
   const sortedTransactions = rawUserAnalytics.value.sort((a: any, b: any) => {
     new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime()
@@ -262,30 +272,30 @@ const setTableData = () =>{
 
   const newTable = tableData.value
 
-  newTable.Transactions = sortedTransactions.map((item: any) =>{
+  newTable.Transactions = sortedTransactions.map((item: any) => {
     return {
-        tx_hash: item.txId,
-        stk_amt: item.amount,
-        tx_type: item.txDirection,
-        date: item.receivedAt,
-        status: item.status,
+      tx_hash: item.txId,
+      stk_amt: item.amount,
+      tx_type: item.txDirection,
+      date: item.receivedAt,
+      status: item.status,
     }
   })
 
   let filteredWallets = [] as any
   let filteredStakingTransactions = [] as any
   sortedTransactions.forEach((item: any) => {
-    const index = filteredWallets.findIndex((i: any)=> i.act === item.walletAddress)
+    const index = filteredWallets.findIndex((i: any) => i.act === item.walletAddress)
 
-    if(index > -1) {
-      if(new Date(filteredWallets[index].date).getTime() < new Date(item.receivedAt).getTime()){
+    if (index > -1) {
+      if (new Date(filteredWallets[index].date).getTime() < new Date(item.receivedAt).getTime()) {
         filteredWallets[index].bal === item.walletBalance
       }
     } else {
       let provider = user.value?.accounts.find(i => i.address.toLocaleLowerCase() === item.walletAddress.toLocaleLowerCase())?.walletProvider
       filteredWallets.push(
         {
-          wallet_provider: provider? provider : 'Unknown',
+          wallet_provider: provider ? provider : 'Unknown',
           act: item.walletAddress,
           bal: item.walletBalance,
           stk_amt: item.amount,
@@ -294,7 +304,7 @@ const setTableData = () =>{
       )
     }
 
-    if(item.type){
+    if (item.type) {
       filteredStakingTransactions.push({
         date: item.receivedAt,
         act: item.walletAddress,
@@ -314,22 +324,22 @@ const setTableData = () =>{
 }
 
 const checkAll = ref(false)
-watch(checkAll, () =>{
-  filteredData.value.map(item =>{
-    if(checkAll.value && !checkedItems.value.includes(item)){
+watch(checkAll, () => {
+  filteredData.value.map(item => {
+    if (checkAll.value && !checkedItems.value.includes(item)) {
       checkedItems.value.push(item)
-    }else if(!checkAll && checkedItems.value.includes(item)){
+    } else if (!checkAll && checkedItems.value.includes(item)) {
       removeItemFromCheckedList(item)
     }
   })
 })
 
-watch(rawUserAnalytics, () =>{
+watch(rawUserAnalytics, () => {
   setTableData()
   filterData()
 })
 
-onMounted(() =>{
+onMounted(() => {
   setTableData()
   filterData()
 })
@@ -339,8 +349,8 @@ onMounted(() =>{
 
 <template>
   <div class="card_container pt-[42px] pb-[34px] text-black flex flex-col">
-    <div class="px-[32px]">
-      <div class="flex flex-wrap gap-[20px] justify-between items-start pb-[20px] border-b border-b-[#EAECF0] ">
+    <div class="">
+      <div class="flex flex-wrap gap-[20px] justify-between items-start pb-[20px] border-b border-b-[#EAECF0] px-[32px]">
         <div>
           <div class="flex items-center gap-[8px]">
             <h6 class="card_title">
@@ -351,73 +361,24 @@ onMounted(() =>{
             List of transactions by wallet and staking actions
           </div>
         </div>
-        <div class="flex items-start gap-[12px]">
-          <button
-            class="flex items-center gap-[8px] export_button h-[38px]"
-            @click="exportFile()"
-          >
-            <vue-feather
-              type="upload-cloud"
-              size="36"
-              class="icon w-[17px] h-min"
-            />
-            Export
-          </button>
-        </div>
-      </div>
-      <div class="flex flex-wrap gap-[20px] justify-between py-[20px] items-center border-b border-b-[#EAECF0]">
-        <div class="grouped_buttons flex flex-nowrap overflow-hidden w-[261px]">
-          <button
-            class="timeframe_button"
-            :class="tableView === 'Wallets'? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
-            @click="tableView = 'Wallets', selectedHeader = 'wallet_provider', checkedItems = [], selectedOrientation = 'ascending'"
-          >
-            Wallets
-          </button>
-          <button
-            class="timeframe_button border-l border-l-[#D0D5DD] " 
-            :class="tableView === 'Transactions'? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
-            @click="tableView = 'Transactions', selectedHeader = 'date', checkedItems = [], selectedOrientation = 'descending'"
-          >
-            Transactions
-          </button>
-          <button
-            class="timeframe_button border-l border-l-[#D0D5DD]"
-            :class="tableView === 'Staking'? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
-            @click="tableView = 'Staking', selectedHeader = 'date', checkedItems = [], selectedOrientation = 'descending'"
-          >
-            Staking Actions
-          </button>
-        </div>
-        <div class="flex flex-wrap items-center gap-[12px]">
-          <div class="flex items-center w-full gap-[12px] search_bar">
-            <vue-feather
-              type="search"
-              class="icon w-[20px] h-min pr-[20px] text-[#667085]"
-            />
-            <input
-              v-model="searchInput"
-              type="text"
-              class="w-full outline-none"
-              placeholder="Search"
-            >
-
-            <button @click="searchInput = ''">
-              <vue-feather
-                type="x"
-                class="icon w-[14px] h-min text-[#667085]"
-              />
+
+        <div class="flex flex-wrap gap-[20px] justify-betwee items-center ">
+          <div class="grouped_buttons flex flex-nowrap overflow-hidden w-[261px]">
+            <button class="timeframe_button" :class="tableView === 'Wallets' ? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
+              @click="tableView = 'Wallets', selectedHeader = 'wallet_provider', checkedItems = [], selectedOrientation = 'ascending'">
+              Wallets
+            </button>
+            <button class="timeframe_button border-l border-l-[#D0D5DD] "
+              :class="tableView === 'Transactions' ? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
+              @click="tableView = 'Transactions', selectedHeader = 'date', checkedItems = [], selectedOrientation = 'descending'">
+              Transactions
+            </button>
+            <button class="timeframe_button border-l border-l-[#D0D5DD]"
+              :class="tableView === 'Staking' ? 'bg-[#F3F3F3]' : 'bg-[#FFFFFF]'"
+              @click="tableView = 'Staking', selectedHeader = 'date', checkedItems = [], selectedOrientation = 'descending'">
+              Staking Actions
             </button>
           </div>
-
-          <!-- <button class="filters_button">
-            <vue-feather
-              type="filter"
-              size="20"
-              class="icon w-[20px] h-min"
-            />
-            Filters
-          </button> -->
         </div>
       </div>
     </div>
@@ -425,209 +386,120 @@ onMounted(() =>{
       <table class="w-full min-h-[200px] ">
         <thead>
           <tr class="bg-[#FCFCFD] border-b border-b-[#EAECF0] whitespace-nowrap">
-            <th
-              v-for="header in tableHeaderOptions[tableView as keyof typeof tableHeaderOptions].headers"
-              :key="header.title"
-              class="table_header "
-            >
+            <th v-for="header in tableHeaderOptions[tableView as keyof typeof tableHeaderOptions].headers"
+              :key="header.title" class="table_header ">
               <div class="flex items-center gap-[5px]">
-                <div
-                  v-if="header.value === 'blank_column'"
-                  class="flex items-center"
-                >
-                  <button
-                    class="checkbox_button"
-                    @click="checkAll = !checkAll"
-                  >
-                    <vue-feather
-                      v-show="checkAll"
-                      type="check"
-                      size="20"
-                      class="icon w-[14px] h-min"
-                    />
+                <div v-if="header.value === 'blank_column'" class="flex items-center">
+                  <button class="checkbox_button" @click="checkAll = !checkAll">
+                    <vue-feather v-show="checkAll" type="check" size="20" class="icon w-[14px] h-min" />
                   </button>
                 </div>
-                <div
-                  v-if="header.value === 'bal'"
-                  class="flex items-center tooltip_container"
-                >
+                <div v-if="header.value === 'bal'" class="flex items-center tooltip_container">
                   Wallet Balance
 
                   <div class="tooltip w-[200px] left-0">
                     Total value of [ethereum] held in the connected wallet addresses. Does not include staked assets.
                   </div>
                 </div>
-                <div
-                  v-else-if="header.value === 'stk_amt'"
-                  class="flex items-center tooltip_container"
-                >
-                  Stake Balance
+                <div v-else-if="header.value === 'stk_amt'" class="flex items-center tooltip_container">
+                  Amount
 
                   <div class="tooltip w-[200px] left-0">
-                    Ethereum actively staked through Casimir from specified wallet address. Does not include withdrawn stake.
+                    Ethereum actively staked through Casimir from specified wallet address. Does not include withdrawn
+                    stake.
                   </div>
                 </div>
-                <div
-                  v-else-if="header.value === 'stk_rwd'"
-                  class="flex items-center tooltip_container"
-                >
+                <div v-else-if="header.value === 'stk_rwd'" class="flex items-center tooltip_container">
                   Stake Rewards (All-Time)
 
                   <div class="tooltip w-[200px] right-0">
-                    Total rewards earned from ethereum that is currently or has ever been staked through Casimir from specified wallet address. Includes withdrawn and restaked earnings.
+                    Total rewards earned from ethereum that is currently or has ever been staked through Casimir from
+                    specified wallet address. Includes withdrawn and restaked earnings.
                   </div>
                 </div>
 
-                <div
-                  v-else-if="header.value === 'staking_fees'"
-                  class="flex items-center tooltip_container"
-                >
+                <div v-else-if="header.value === 'staking_fees'" class="flex items-center tooltip_container">
                   Staking Fees
 
                   <div class="tooltip w-[200px] left-0">
                     Staking Fees (in staking actions table)
-                    Total fees charged covering Casimir maintenance fee, operator fees, SSV network fee, and the cost of oracle transactions. 
+                    Total fees charged covering Casimir maintenance fee, operator fees, SSV network fee, and the cost of
+                    oracle transactions.
                   </div>
                 </div>
-                
-                <div
-                  v-else-if="header.value === 'tx_hash'"
-                  class="flex items-center"
-                >
+
+                <div v-else-if="header.value === 'tx_hash'" class="flex items-center">
                   Tx Hash
                 </div>
                 <div v-else>
                   {{ header.title }}
                 </div>
-                <button 
-                  class="ml-[4px] h-min"
-                  :class="selectedHeader === header.value? 'opacity-100 text-primary' : 'opacity-90 text-grey_4'"
-                  @click="selectedHeader = header.value, selectedOrientation === 'ascending'? selectedOrientation = 'descending' : selectedOrientation = 'ascending'"
-                >
-                  <vue-feather
-                    type="arrow-up"
-                    size="20"
-                    class="icon h-[8px]"
-                    :class="selectedOrientation === 'ascending'? 'w-[10px]' : 'w-[8px] opacity-50'"
-                  /> 
+                <button v-show="header.value != 'blank_column'" class="ml-[4px] h-min"
+                  :class="selectedHeader === header.value ? 'opacity-100 text-primary' : 'opacity-90 text-grey_4'"
+                  @click="selectedHeader = header.value, selectedOrientation === 'ascending' ? selectedOrientation = 'descending' : selectedOrientation = 'ascending'">
+                  <vue-feather type="arrow-up" size="20" class="icon h-[8px]"
+                    :class="selectedOrientation === 'ascending' ? 'w-[10px]' : 'w-[8px] opacity-50'" />
                   <br>
-                  <vue-feather
-                    type="arrow-down"
-                    size="20"
-                    class="icon h-[8px]"
-                    :class="selectedOrientation === 'descending'? 'w-[10px]' : 'w-[8px] opacity-50'"
-                  />
+                  <vue-feather type="arrow-down" size="20" class="icon h-[8px]"
+                    :class="selectedOrientation === 'descending' ? 'w-[10px]' : 'w-[8px] opacity-50'" />
                 </button>
               </div>
             </th>
           </tr>
         </thead>
-        <tbody
-          class="w-full"
-        >
-          <tr
-            v-for="(item, i) in filteredData"
-            :key="i"
-            class="w-full text-grey_5 text-body border-b border-grey_2 h-[72px]"
-          >
-            <td
-              v-for="header in tableHeaderOptions[tableView as keyof typeof tableHeaderOptions].headers"
-              :key="header.title"
-              class="dynamic_padding"
-            >
-              <div
-                v-if="header.value === 'blank_column'"
-                class="flex items-center gap-[12px]"
-              >
-                <button
-                  class="checkbox_button"
-                  @click="checkedItems.includes(item)? removeItemFromCheckedList(item) : checkedItems.push(item)"
-                >
-                  <vue-feather
-                    v-show="checkedItems.includes(item)"
-                    type="check"
-                    size="20"
-                    class="icon w-[14px] h-min"
-                  />
+        <tbody class="w-full">
+          <tr v-for="(item, i) in filteredData" :key="i"
+            class="w-full text-grey_5 text-body border-b border-grey_2 h-[72px]">
+            <td v-for="header in tableHeaderOptions[tableView as keyof typeof tableHeaderOptions].headers"
+              :key="header.title" class="dynamic_padding">
+              <div v-if="header.value === 'blank_column'" class="flex items-center gap-[12px]">
+                <button class="checkbox_button"
+                  @click="checkedItems.includes(item) ? removeItemFromCheckedList(item) : checkedItems.push(item)">
+                  <vue-feather v-show="checkedItems.includes(item)" type="check" size="20" class="icon w-[14px] h-min" />
                 </button>
               </div>
-              <div
-                v-if="header.value === 'wallet_provider'"
-                class="flex items-center gap-[12px]"
-              >
-                <img
-                  v-if="item[header.value] != 'Unknown'"
-                  :src="`/${item[header.value].toLocaleLowerCase()}.svg`"
-                  alt="Avatar "
-                  class="w-[20px] h-[20px]"
-                >
+              <div v-if="header.value === 'wallet_provider'" class="flex items-center gap-[12px]">
+                <img v-if="item[header.value] != 'Unknown'" :src="`/${item[header.value].toLocaleLowerCase()}.svg`"
+                  alt="Avatar " class="w-[20px] h-[20px]">
                 <h6 class="title_name 800s:w-[20px]">
-                  {{ item[header.value ] }}
+                  {{ item[header.value] }}
                 </h6>
               </div>
-              <div
-                v-else-if="header.value === 'act'"
-                class="flex items-center gap-[12px] underline"
-              >
+              <div v-else-if="header.value === 'act'" class="flex items-center gap-[12px] underline">
                 <a href="">
-                  {{ convertString(item[header.value ]) }}
+                  {{ convertString(item[header.value]) }}
                 </a>
               </div>
-              <div
-                v-else-if="header.value === 'tx_hash'"
-                class="flex items-center gap-[12px]"
-              >
+              <div v-else-if="header.value === 'tx_hash'" class="flex items-center gap-[12px]">
                 <a class="">
-                  {{ convertString(item[header.value ]) }}
+                  {{ convertString(item[header.value]) }}
                 </a>
               </div>
-              <div
-                v-else-if="header.value === 'status'"
-                class="flex items-center gap-[12px]"
-              >
-                <div
-                  v-if="item[header.value ] === 'Active'"
-                  class="flex items-center gap-[8px] status_pill bg-[#ECFDF3] text-[#027A48]"
-                >
+              <div v-else-if="header.value === 'status'" class="flex items-center gap-[12px]">
+                <div v-if="item[header.value] === 'Active'"
+                  class="flex items-center gap-[8px] status_pill bg-[#ECFDF3] text-[#027A48]">
                   <div class="bg-[#027A48] rounded-[999px] w-[8px] h-[8px]" />
                   Staked
                 </div>
-                <div
-                  v-else-if="item[header.value ] === 'Pending'" 
-                  class="flex items-center gap-[8px] status_pill bg-[#FFFAEB] text-[#B54708]"
-                >
+                <div v-else-if="item[header.value] === 'Pending'"
+                  class="flex items-center gap-[8px] status_pill bg-[#FFFAEB] text-[#B54708]">
                   <div class="bg-[#F79009] rounded-[999px] w-[8px] h-[8px]" />
                   Pending
                 </div>
               </div>
-              <div
-                v-else-if="header.value === 'bal'"
-                class="flex items-center gap-[12px] pl-[20px]"
-              >
+              <div v-else-if="header.value === 'bal'" class="flex items-center gap-[12px] pl-[20px]">
                 {{ item[header.value] }} ETH
               </div>
-              <div
-                v-else-if="header.value === 'stk_amt'"
-                class="flex items-center gap-[12px] pl-[20px]"
-              >
+              <div v-else-if="header.value === 'stk_amt'" class="flex items-center gap-[12px] pl-[20px]">
                 {{ item[header.value] }} ETH
               </div>
-              <div
-                v-else-if="header.value === 'stk_rwd'"
-                class="flex items-center gap-[12px] pl-[20px]"
-              >
+              <div v-else-if="header.value === 'stk_rwd'" class="flex items-center gap-[12px] pl-[20px]">
                 {{ item[header.value] }} ETH
               </div>
-              <div
-                v-else-if="header.value === 'amount'"
-                class="flex items-center gap-[12px] pl-[20px]"
-              >
+              <div v-else-if="header.value === 'amount'" class="flex items-center gap-[12px] pl-[20px]">
                 {{ item[header.value] }} ETH
               </div>
-              <div
-                v-else-if="header.value === 'staking_fees'"
-                class="flex items-center gap-[12px] pl-[20px]"
-              >
+              <div v-else-if="header.value === 'staking_fees'" class="flex items-center gap-[12px] pl-[20px]">
                 {{ item[header.value] }} ETH
               </div>
               <div v-else>
@@ -640,21 +512,15 @@ onMounted(() =>{
     </div>
     <div class="flex justify-between items-center mt-[12px]">
       <div class="page_number ml-[56px]">
-        Page {{ totalPages === 0? 0 : currentPage }} of {{ totalPages }}
+        Page {{ totalPages === 0 ? 0 : currentPage }} of {{ totalPages }}
       </div>
       <div class="flex items-center gap-[12px]">
-        <button
-          class="pagination_button"
-          :disabled="currentPage === 1"
-          @click="currentPage > 1? currentPage = currentPage - 1 : ''"
-        >
+        <button class="pagination_button" :disabled="currentPage === 1"
+          @click="currentPage > 1 ? currentPage = currentPage - 1 : ''">
           Previous
         </button>
-        <button
-          class="pagination_button mr-[33px]"
-          :disabled="currentPage === totalPages"
-          @click="currentPage < totalPages? currentPage = currentPage + 1 : ''"
-        >
+        <button class="pagination_button mr-[33px]" :disabled="currentPage === totalPages"
+          @click="currentPage < totalPages ? currentPage = currentPage + 1 : ''">
           Next
         </button>
       </div>
@@ -663,7 +529,7 @@ onMounted(() =>{
 </template>
 
 <style scoped>
-.dynamic_padding{
+.dynamic_padding {
   padding: 12px 24px;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -672,210 +538,230 @@ onMounted(() =>{
     padding: 12px 0px 12px 12px;
   } */
 }
-.status_pill{
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 18px;
-    text-align: center;
-    padding: 2px 8px 2px 6px;
-    border-radius: 16px;
+
+.status_pill {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  text-align: center;
+  padding: 2px 8px 2px 6px;
+  border-radius: 16px;
 }
-.last_assessed_text{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 20px;
-    color: #667085;
+
+.last_assessed_text {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 20px;
+  color: #667085;
 }
-.rating_percentage{
-    font-family: 'Inter';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 18px;
-    text-align: center;
-    color: #027A48;
+
+.rating_percentage {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  text-align: center;
+  color: #027A48;
 }
-.rating_text{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #344054;
+
+.rating_text {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #344054;
 }
-.title_name{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #101828;
+
+.title_name {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #101828;
 }
-.checkbox_button{
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    width: 20px;
-    height: 20px;
-    background: #F5F8FF;
-    border: 1px solid #ACBFDC;
-    border-radius: 6px;
-    color: #7D8398;
+
+.checkbox_button {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  width: 20px;
+  height: 20px;
+  background: #F5F8FF;
+  border: 1px solid #ACBFDC;
+  border-radius: 6px;
+  color: #7D8398;
 }
-.table_header{
-    padding: 12px 24px;
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 18px;
-    color: #667085;
-    text-align: left;
-    /* @media (max-width: 800px) {
+
+.table_header {
+  padding: 12px 24px;
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  color: #667085;
+  text-align: left;
+  /* @media (max-width: 800px) {
       padding: 12px 0px 12px 12px;
     } */
 }
-.pagination_button{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #344054;
-    padding: 6px 12px;
-    background: #FFFFFF;
-    border: 1px solid #D0D5DD;
-    box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
-    border-radius: 8px;
+
+.pagination_button {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #344054;
+  padding: 6px 12px;
+  background: #FFFFFF;
+  border: 1px solid #D0D5DD;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 8px;
 }
-.page_number{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #344054;
+
+.page_number {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #344054;
 }
+
 .filters_button {
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #344054;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    padding: 10px 16px;
-    gap: 8px;
-    width: 101px;
-    height: 40px;
-    background: #FFFFFF;
-    border: 1px solid #D0D5DD;
-    box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
-    border-radius: 8px;
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #344054;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 10px 16px;
+  gap: 8px;
+  width: 101px;
+  height: 40px;
+  background: #FFFFFF;
+  border: 1px solid #D0D5DD;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 8px;
 }
-.search_bar{
-    height: 34px;
-    background: #FFFFFF;
-    border: 1px solid #D0D5DD;
-    box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
-    border-radius: 8px;
-    padding: 5px 12px;
+
+.search_bar {
+  height: 34px;
+  background: #FFFFFF;
+  border: 1px solid #D0D5DD;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 8px;
+  padding: 5px 12px;
 }
-.search_bar input{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 24px;
-    color: #667085;
+
+.search_bar input {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 24px;
+  color: #667085;
 }
-.timeframe_button{
-    padding: 5px 10px;
-    /* background: #FFFFFF; */
-    align-items: center;
+
+.timeframe_button {
+  padding: 5px 10px;
+  /* background: #FFFFFF; */
+  align-items: center;
 }
-.grouped_buttons{
-    border: 1px solid #D0D5DD;
-    filter: drop-shadow(0px 1px 2px rgba(16, 24, 40, 0.05));
-    border-radius: 8px;
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #344054;
+
+.grouped_buttons {
+  border: 1px solid #D0D5DD;
+  filter: drop-shadow(0px 1px 2px rgba(16, 24, 40, 0.05));
+  border-radius: 8px;
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 20px;
+  color: #344054;
 }
-.add_vendor_button{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #FFFFFF;
-    padding: 8px 10px;
-    background: #0F6AF2;
-    border: 1px solid #0F6AF2;
-    box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
-    border-radius: 8px;
+
+.add_vendor_button {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #FFFFFF;
+  padding: 8px 10px;
+  background: #0F6AF2;
+  border: 1px solid #0F6AF2;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 8px;
 }
-.export_button{
-    background: #FFFFFF;
-    border: 1px solid #D0D5DD;
-    box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
-    border-radius: 8px;
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 20px;
-    color: #344054;
-    padding: 8px 10px;
+
+.export_button {
+  background: #FFFFFF;
+  border: 1px solid #D0D5DD;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 8px;
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 20px;
+  color: #344054;
+  padding: 8px 10px;
 }
-.card_subtitle{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 20px;
-    color: #667085;
+
+.card_subtitle {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 20px;
+  color: #667085;
 }
-.provider_amount_pill{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 18px;
-    color: #344054;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    padding: 2px 8px;
-    background: #F2F4F7;
-    border-radius: 16px;
+
+.provider_amount_pill {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  color: #344054;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 2px 8px;
+  background: #F2F4F7;
+  border-radius: 16px;
 }
-.card_title{
-    font-family: 'IBM Plex Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-size: 18px;
-    line-height: 28px;
-    color: #101828;
+
+.card_title {
+  font-family: 'IBM Plex Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 18px;
+  line-height: 28px;
+  color: #101828;
 }
-.card_container{
-    width: 100%;
-    box-sizing: border-box;
-    background: #FFFFFF;
-    border: 1px solid #D0D5DD;
-    box-shadow: 0px 12px 16px -4px rgba(16, 24, 40, 0.04);
-    border-radius: 3px;
+
+.card_container {
+  width: 100%;
+  box-sizing: border-box;
+  background: #FFFFFF;
+  border: 1px solid #D0D5DD;
+  box-shadow: 0px 12px 16px -4px rgba(16, 24, 40, 0.04);
+  border-radius: 3px;
 }
 </style>@/composables/user
\ No newline at end of file
diff --git a/contracts/ethereum/scripts/resources/ssv-network b/contracts/ethereum/scripts/resources/ssv-network
new file mode 160000
index 000000000..b8e03e7d2
--- /dev/null
+++ b/contracts/ethereum/scripts/resources/ssv-network
@@ -0,0 +1 @@
+Subproject commit b8e03e7d2edf28a4631e16489f00052ed42a7e74
diff --git a/services/oracle/scripts/resources/rockx-dkg-cli b/services/oracle/scripts/resources/rockx-dkg-cli
new file mode 160000
index 000000000..171973247
--- /dev/null
+++ b/services/oracle/scripts/resources/rockx-dkg-cli
@@ -0,0 +1 @@
+Subproject commit 171973247f89caae74003c484c3913ecfd33e62e

From 373cf5bdf68c2fdab78f23e8a22e37d2c65d4aa2 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Thu, 26 Oct 2023 16:11:51 -0400
Subject: [PATCH 2/2] Delete old submodules

---
 contracts/ethereum/scripts/resources/ssv-network | 1 -
 services/oracle/scripts/resources/rockx-dkg-cli  | 1 -
 2 files changed, 2 deletions(-)
 delete mode 160000 contracts/ethereum/scripts/resources/ssv-network
 delete mode 160000 services/oracle/scripts/resources/rockx-dkg-cli

diff --git a/contracts/ethereum/scripts/resources/ssv-network b/contracts/ethereum/scripts/resources/ssv-network
deleted file mode 160000
index b8e03e7d2..000000000
--- a/contracts/ethereum/scripts/resources/ssv-network
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b8e03e7d2edf28a4631e16489f00052ed42a7e74
diff --git a/services/oracle/scripts/resources/rockx-dkg-cli b/services/oracle/scripts/resources/rockx-dkg-cli
deleted file mode 160000
index 171973247..000000000
--- a/services/oracle/scripts/resources/rockx-dkg-cli
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 171973247f89caae74003c484c3913ecfd33e62e