feat: Move time calculation to MDW (#489)

src/components/DashboardStateChannelsPanel.vue

@@ -15,8 +15,6 @@
 </template>
 <script setup>
 import AppPanel from '@/components/AppPanel'
-import DashboardStateChannelsSwiper from '@/components/DashboardStateChannelsSwiper'
-import DashboardStateChannelsTable from '@/components/DashboardStateChannelsTable'
 import { stateChannelsHints } from '@/utils/hints/stateChannelsHints'
 </script>
 

src/components/DashboardStateChannelsSwiper.vue

@@ -102,7 +102,7 @@
               </app-tooltip>
             </th>
             <td class="dashboard-state-channels-swiper__data">
-              {{ channel.updateType }}
+              {{ channel.lastTxType }}
             </td>
           </tr>
         </tbody>

src/components/DashboardStateChannelsTable.vue

@@ -79,7 +79,7 @@
             :height="channel.updatedHeight"
             :datetime="channel.updated"/>
         </td>
-        <td>{{ channel.updateType }}</td>
+        <td>{{ channel.lastTxType }}</td>
       </tr>
     </tbody>
   </table>

src/components/OraclesTable.vue

@@ -39,8 +39,8 @@
         </td>
         <td class="oracles-table__data">
           <block-time-cell
-            :height="oracle.activatedHeight"
-            :datetime="oracle.activated"/>
+            :height="oracle.registeredHeight"
+            :datetime="oracle.registered"/>
         </td>
         <td class="oracles-table__data">
           <block-time-cell

src/components/OraclesTableCondensed.vue

@@ -31,8 +31,8 @@
           </th>
           <td class="oracles-table-condensed__data">
             <block-time-cell
-              :height="oracle.activatedHeight"
-              :datetime="oracle.activated"/>
+              :height="oracle.registeredHeight"
+              :datetime="oracle.registered"/>
           </td>
         </tr>
         <tr class="oracles-table-condensed__row">

src/components/StateChannelsTable.vue

@@ -77,7 +77,7 @@
             :height="channel.updatedHeight"
             :datetime="channel.updated"/>
         </td>
-        <td>{{ channel.updateType }}</td>
+        <td>{{ channel.lastTxType }}</td>
       </tr>
     </tbody>
   </table>

src/components/StateChannelsTableCondensed.vue

@@ -108,7 +108,7 @@
             </app-tooltip>
           </th>
           <td class="state-channels-table-condensed__data">
-            {{ channel.updateType }}
+            {{ channel.lastTxType }}
           </td>
         </tr>
       </tbody>

src/stores/contractDetails.js

@@ -1,13 +1,11 @@
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import { useRuntimeConfig } from 'nuxt/app'
 import useAxios from '@/composables/useAxios'
 import { adaptContractDetails, adaptContractEvents, adaptTransactions } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useContractDetailsStore = defineStore('contractDetails', () => {
   const { NODE_URL, MIDDLEWARE_URL } = useRuntimeConfig().public
   const axios = useAxios()
-  const { blockHeight } = storeToRefs(useRecentBlocksStore())
 
   const contractId = ref(null)
   const contractCallsCount = ref(null)
@@ -21,7 +19,7 @@ export const useContractDetailsStore = defineStore('contractDetails', () => {
 
   const contractEvents = computed(() => {
     return rawContractEvents.value
-      ? adaptContractEvents(rawContractEvents.value, blockHeight.value)
+      ? adaptContractEvents(rawContractEvents.value)
       : null
   })
 

src/stores/dashboardStateChannels.js

@@ -1,18 +1,16 @@
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import { useRuntimeConfig } from 'nuxt/app'
 import useAxios from '@/composables/useAxios'
 import { adaptDashboardStateChannels } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useDashboardStateChannelsStore = defineStore('dashboardStateChannels', () => {
   const { MIDDLEWARE_URL } = useRuntimeConfig().public
   const axios = useAxios()
-  const { blockHeight } = storeToRefs(useRecentBlocksStore())
   const rawStateChannels = ref(null)
 
   const stateChannels = computed(() =>
     rawStateChannels.value
-      ? adaptDashboardStateChannels(rawStateChannels.value, blockHeight.value)
+      ? adaptDashboardStateChannels(rawStateChannels.value)
       : null,
   )
 

src/stores/nameDetails.js

@@ -19,7 +19,7 @@ export const useNameDetailsStore = defineStore('nameDetails', () => {
     return rawName.value?.hash || rawName.value?.info.lastBid.tx.nameId
   })
   const nameActions = computed(() => {
-    return rawNameActions.value ? adaptNameActions(rawNameActions.value, blockHeight.value) : null
+    return rawNameActions.value ? adaptNameActions(rawNameActions.value) : null
   })
   const hasNameHistory = computed(() => {
     return !!nameHash.value

src/stores/names.js

@@ -21,7 +21,7 @@ export const useNamesStore = defineStore('names', () => {
   })
   const inAuctionNames = computed(() => {
     return rawInAuctionNames.value
-      ? adaptInAuctionNames(rawInAuctionNames.value, blockHeight.value)
+      ? adaptInAuctionNames(rawInAuctionNames.value)
       : null
   })
   const auctionsEndingSoon = computed(() => inAuctionNames.value?.data.slice(0, 4))

src/stores/oracleDetails.js

@@ -1,12 +1,10 @@
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import { useRuntimeConfig } from 'nuxt/app'
 import useAxios from '@/composables/useAxios'
 import { adaptOracleDetails, adaptOracleEvents } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useOracleDetailsStore = defineStore('oracleDetails', () => {
   const { MIDDLEWARE_URL } = useRuntimeConfig().public
-  const { blockHeight } = storeToRefs(useRecentBlocksStore())
   const axios = useAxios()
 
   const oracleId = ref(null)
@@ -18,7 +16,6 @@ export const useOracleDetailsStore = defineStore('oracleDetails', () => {
     ? adaptOracleDetails(
       rawOracle.value,
       lastExtendedTx.value,
-      blockHeight.value,
       lastQueryTx.value,
     )
     : null,
@@ -41,7 +38,7 @@ export const useOracleDetailsStore = defineStore('oracleDetails', () => {
   }
 
   async function fetchOracle() {
-    const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/oracles/${oracleId.value}`)
+    const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/oracles/${oracleId.value}?tx_hash=true`)
     rawOracle.value = data
   }
 

src/stores/oracles.js

@@ -1,14 +1,11 @@
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import { useRuntimeConfig } from 'nuxt/app'
 import useAxios from '@/composables/useAxios'
 import { adaptOracles } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useOraclesStore = defineStore('oracles', () => {
   const { MIDDLEWARE_URL } = useRuntimeConfig().public
   const axios = useAxios()
-  const recentBlocksStore = useRecentBlocksStore()
-  const { blockHeight } = storeToRefs(recentBlocksStore)
 
   const rawOracles = ref(null)
   const rawOraclesCount = ref(null)
@@ -22,7 +19,7 @@ export const useOraclesStore = defineStore('oracles', () => {
 
   const oracles = computed(() => {
     return rawOracles.value
-      ? adaptOracles(rawOracles.value, blockHeight.value)
+      ? adaptOracles(rawOracles.value)
       : null
   })
 

src/stores/stateChannelDetails.js

@@ -1,13 +1,11 @@
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import { useRuntimeConfig } from 'nuxt/app'
 import useAxios from '@/composables/useAxios'
 import { adaptStateChannelDetails, adaptTransactions } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useStateChannelDetailsStore = defineStore('stateChannelDetails', () => {
   const { MIDDLEWARE_URL } = useRuntimeConfig().public
   const axios = useAxios()
-  const { blockHeight } = storeToRefs(useRecentBlocksStore())
 
   const stateChannelId = ref(null)
   const rawStateChannel = ref(null)
@@ -19,7 +17,6 @@ export const useStateChannelDetailsStore = defineStore('stateChannelDetails', ()
     ? adaptStateChannelDetails(
       rawStateChannel.value,
       rawStateChannelCreateTx.value,
-      blockHeight.value,
     )
     : null,
   )
@@ -40,14 +37,17 @@ export const useStateChannelDetailsStore = defineStore('stateChannelDetails', ()
 
     return true
   }
+
   async function fetchStateChannel() {
     const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/channels/${stateChannelId.value}`)
     rawStateChannel.value = data
   }
+
   async function fetchStateChannelCreateTx() {
     const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/channels/${stateChannelId.value}/updates?direction=forward&limit=1`)
     rawStateChannelCreateTx.value = data.data[0]
   }
+
   async function fetchStateChannelTransactions({ limit, queryParameters } = {}) {
     rawStateChannelTransactions.value = null
 

src/stores/stateChannels.js

@@ -1,19 +1,17 @@
 import { useRuntimeConfig } from 'nuxt/app'
-import { defineStore, storeToRefs } from 'pinia'
+import { defineStore } from 'pinia'
 import useAxios from '@/composables/useAxios'
 import { adaptStateChannels } from '@/utils/adapters'
-import { useRecentBlocksStore } from '@/stores/recentBlocks'
 
 export const useStateChannelsStore = defineStore('stateChannels', () => {
   const { MIDDLEWARE_URL } = useRuntimeConfig().public
   const axios = useAxios()
-  const { blockHeight } = storeToRefs(useRecentBlocksStore())
 
   const rawStateChannels = ref(null)
   const stateChannelsCount = ref(null)
   const stateChannels = computed(() => {
     return rawStateChannels.value
-      ? adaptStateChannels(rawStateChannels.value, blockHeight.value)
+      ? adaptStateChannels(rawStateChannels.value)
       : null
   })
 

src/stores/tokenDetails.js

@@ -40,9 +40,8 @@ export const useTokenDetailsStore = defineStore('tokenDetails', () => {
   )
 
   const tokenEvents = computed(() => {
-    const store = useRecentBlocksStore()
     return rawTokenEvents.value
-      ? adaptTokenEvents(rawTokenEvents.value, store.blockHeight)
+      ? adaptTokenEvents(rawTokenEvents.value)
       : null
   })