fix: walletd events update

Author: alexfreska

.changeset/gentle-zoos-love.md

@@ -0,0 +1,6 @@
+---
+'walletd': minor
+'@siafoundation/walletd-types': minor
+---
+
+Updated wallet events to include maturityHeight and renamed val to data. Closes https://github.com/SiaFoundation/walletd/issues/114

apps/walletd/contexts/events/index.tsx

@@ -68,14 +68,14 @@ export function useEventsMain() {
       let amountSf = 0
       if (e.type === 'transaction') {
         const inputsScTotal =
-          e.val?.siacoinInputs?.reduce((acc, o) => {
+          e.data?.siacoinInputs?.reduce((acc, o) => {
             if (e.relevant.includes(o.siacoinOutput.address)) {
               return acc.plus(o.siacoinOutput.value)
             }
             return acc
           }, new BigNumber(0)) || new BigNumber(0)
         const outputsScTotal =
-          e.val?.siacoinOutputs?.reduce((acc, o) => {
+          e.data?.siacoinOutputs?.reduce((acc, o) => {
             if (e.relevant.includes(o.siacoinOutput.address)) {
               return acc.plus(o.siacoinOutput.value)
             }
@@ -84,14 +84,14 @@ export function useEventsMain() {
         amountSc = outputsScTotal.minus(inputsScTotal)
 
         const inputsSfTotal =
-          e.val?.siafundInputs?.reduce((acc, o) => {
+          e.data?.siafundInputs?.reduce((acc, o) => {
             if (e.relevant.includes(o.siafundElement.siafundOutput.address)) {
               return acc + o.siafundElement.siafundOutput.value
             }
             return acc
           }, 0) || 0
         const outputsSfTotal =
-          e.val?.siafundOutputs?.reduce((acc, o) => {
+          e.data?.siafundOutputs?.reduce((acc, o) => {
             if (e.relevant.includes(o.siafundOutput.address)) {
               return acc + o.siafundOutput.value
             }
@@ -101,10 +101,10 @@ export function useEventsMain() {
       }
 
       if (e.type === 'miner payout') {
-        amountSc = new BigNumber(e.val.siacoinOutput.siacoinOutput.value)
+        amountSc = new BigNumber(e.data.siacoinOutput.siacoinOutput.value)
       }
       if (e.type === 'foundation subsidy') {
-        amountSc = new BigNumber(e.val.siacoinOutput.siacoinOutput.value)
+        amountSc = new BigNumber(e.data.siacoinOutput.siacoinOutput.value)
       }
 
       const res: EventData = {
@@ -117,10 +117,10 @@ export function useEventsMain() {
         amountSf,
       }
       if (e.type === 'transaction') {
-        res.fee = new BigNumber(e.val.fee)
+        res.fee = new BigNumber(e.data.fee)
       }
       if (e.type === 'contract payout') {
-        res.contractId = e.val.fileContract.id
+        res.contractId = e.data.fileContract.id
       }
       return res
     })

libs/walletd-types/src/types.ts

@@ -39,6 +39,7 @@ export type WalletEventBase = {
   id: Hash256
   timestamp: string
   index: ChainIndex
+  maturityHeight: number
   relevant: Address[]
 }
 
@@ -67,7 +68,7 @@ export type WalletHostAnnouncement = {
 
 export type WalletEventTransaction = WalletEventBase & {
   type: 'transaction'
-  val: {
+  data: {
     siacoinInputs?: SiacoinElement[]
     siacoinOutputs?: SiacoinElement[]
     siafundInputs?: WalletSiafundInput[]
@@ -81,14 +82,14 @@ export type WalletEventTransaction = WalletEventBase & {
 
 export type WalletEventMinerPayout = WalletEventBase & {
   type: 'miner payout'
-  val: {
+  data: {
     siacoinOutput: SiacoinElement
   }
 }
 
 export type WalletEventContractPayout = WalletEventBase & {
   type: 'contract payout'
-  val: {
+  data: {
     fileContract: FileContractElement
     siacoinOutput: SiacoinElement
     missed: boolean
@@ -101,7 +102,7 @@ export type WalletEventSiafundClaim = WalletEventBase & {
 
 export type WalletEventFoundationSubsidy = WalletEventBase & {
   type: 'foundation subsidy'
-  val: {
+  data: {
     siacoinOutput: SiacoinElement
   }
 }