feat(walletd-libs): construct api and v2 api changes

.changeset/hungry-monkeys-wonder.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/walletd-js': minor
+'@siafoundation/walletd-react': minor
+'@siafoundation/walletd-types': minor
+---
+
+Added construct APIs for both v1 and v2 transactions.

.changeset/perfect-turtles-kiss.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/walletd-js': minor
+'@siafoundation/walletd-react': minor
+'@siafoundation/walletd-types': minor
+---
+
+Added the basis ChainIndex parameter to txpool broadcast API.

.changeset/tiny-deers-wink.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/walletd-js': minor
+'@siafoundation/walletd-react': minor
+'@siafoundation/walletd-types': minor
+---
+
+Added the basis ChainIndex parameter to fund APIs.

.changeset/tricky-carrots-deny.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/walletd-js': minor
+'@siafoundation/walletd-react': minor
+'@siafoundation/walletd-types': minor
+---
+
+Added the basis ChainIndex value to txpool transactions response.

apps/walletd/contexts/addresses/dataset.tsx

@@ -19,8 +19,8 @@ export function transformAddressesResponse(
     const datum: AddressData = {
       id: address,
       address,
-      description: description,
-      spendPolicy: spendPolicy,
+      description,
+      spendPolicy,
       metadata: (metadata || {}) as WalletAddressMetadata,
       walletId,
       onClick: () =>

apps/walletd/contexts/addresses/types.ts

@@ -2,6 +2,7 @@ import {
   WalletAddress,
   WalletAddressMetadata,
 } from '@siafoundation/walletd-types'
+import { SpendPolicy } from '@siafoundation/types'
 
 export type CellContext = {
   siascanUrl: string
@@ -11,7 +12,7 @@ export type AddressData = {
   id: string
   address: string
   description?: string
-  spendPolicy?: string
+  spendPolicy?: SpendPolicy
   metadata: WalletAddressMetadata
   walletId: string
   raw?: WalletAddress

apps/walletd/dialogs/WalletSendLedgerDialog/useFundAndSign.tsx

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/types'
+import { ChainIndex, Transaction } from '@siafoundation/types'
 import { useCallback } from 'react'
 import { SendParams } from '../_sharedWalletSend/types'
 
@@ -7,6 +7,7 @@ type Props = {
     fundedTransaction?: Transaction
     toSign?: string[]
     error?: string
+    basis?: ChainIndex
   }>
   cancel: (transaction: Transaction) => Promise<void>
   sign: ({
@@ -28,6 +29,7 @@ export function useFundAndSign({ fund, cancel, sign }: Props) {
         fundedTransaction,
         toSign,
         error: fundingError,
+        basis,
       } = await fund(params)
       if (fundingError) {
         return {
@@ -47,6 +49,7 @@ export function useFundAndSign({ fund, cancel, sign }: Props) {
         }
       }
       return {
+        basis,
         signedTransaction,
       }
     },

apps/walletd/dialogs/WalletSendLedgerDialog/useSendForm.tsx

@@ -10,7 +10,7 @@ import {
 } from '@siafoundation/design-system'
 import { DeviceConnectForm } from '../DeviceConnectForm'
 import { useLedger } from '../../contexts/ledger'
-import { Transaction } from '@siafoundation/types'
+import { Transaction, ChainIndex } from '@siafoundation/types'
 import { LedgerSignTxn } from './LedgerSignTxn'
 import { useSign } from './useSign'
 import { useBroadcast } from '../_sharedWalletSend/useBroadcast'
@@ -69,10 +69,12 @@ export function useSendForm({ params, step, onConfirm }: Props) {
   const fundAndSign = useFundAndSign({ cancel, fund, sign })
   const [waitingForUser, setWaitingForUser] = useState(false)
   const [txn, setTxn] = useState<Transaction>()
+  const [basis, setBasis] = useState<ChainIndex>()
 
   useEffect(() => {
     if (step === 'compose') {
       setTxn(undefined)
+      setBasis(undefined)
     }
   }, [step])
 
@@ -109,8 +111,17 @@ export function useSendForm({ params, step, onConfirm }: Props) {
         return
       }
 
+      if (!txn) {
+        return
+      }
+
+      if (!basis) {
+        return
+      }
+
       const { error } = await broadcast({
         signedTransaction: txn,
+        basis,
       })
 
       if (error) {
@@ -124,7 +135,7 @@ export function useSendForm({ params, step, onConfirm }: Props) {
         // transactionId,
       })
     },
-    [broadcast, txn, onConfirm]
+    [broadcast, txn, basis, onConfirm]
   )
 
   const onInvalid = useOnInvalid(fields)
@@ -136,11 +147,12 @@ export function useSendForm({ params, step, onConfirm }: Props) {
 
   const runFundAndSign = useCallback(async () => {
     setWaitingForUser(true)
-    const { signedTransaction, error } = await fundAndSign(params)
+    const { signedTransaction, error, basis } = await fundAndSign(params)
     if (error) {
       triggerErrorToast({ title: error })
     } else {
       setTxn(signedTransaction)
+      setBasis(basis)
       form.setValue('isSigned', true)
     }
     setWaitingForUser(false)

apps/walletd/dialogs/WalletSendSeedDialog/useSignAndBroadcast.tsx

@@ -49,6 +49,7 @@ export function useSignAndBroadcast() {
         fundedTransaction,
         toSign,
         error: fundingError,
+        basis,
       } = await fund(params)
       if (fundingError) {
         return {
@@ -77,7 +78,7 @@ export function useSignAndBroadcast() {
       cacheWalletMnemonic(walletId, mnemonic)
 
       // broadcast
-      return broadcast({ signedTransaction })
+      return broadcast({ signedTransaction, basis })
     },
     [
       cancel,

apps/walletd/dialogs/_sharedWalletSend/useBroadcast.tsx

@@ -1,12 +1,18 @@
-import { Transaction } from '@siafoundation/types'
+import { Transaction, ChainIndex } from '@siafoundation/types'
 import { useTxPoolBroadcast } from '@siafoundation/walletd-react'
 import { useCallback } from 'react'
 
 export function useBroadcast({ cancel }: { cancel: (t: Transaction) => void }) {
   const txPoolBroadcast = useTxPoolBroadcast()
 
   const broadcast = useCallback(
-    async ({ signedTransaction }: { signedTransaction: Transaction }) => {
+    async ({
+      signedTransaction,
+      basis,
+    }: {
+      signedTransaction: Transaction
+      basis: ChainIndex
+    }) => {
       if (!signedTransaction) {
         return {
           error: 'No signed transaction',
@@ -15,6 +21,7 @@ export function useBroadcast({ cancel }: { cancel: (t: Transaction) => void }) {
       // broadcast
       const broadcastResponse = await txPoolBroadcast.post({
         payload: {
+          basis,
           transactions: [signedTransaction],
           v2transactions: [],
         },

apps/walletd/dialogs/_sharedWalletSend/useFund.tsx

@@ -54,6 +54,7 @@ export function useFund() {
           }
         }
         return {
+          basis: fundResponse.data.basis,
           fundedTransaction: fundResponse.data.transaction,
           toSign: fundResponse.data.toSign,
         }
@@ -103,6 +104,7 @@ export function useFund() {
         }
         toSign.push(...fundResponse.data.toSign)
         return {
+          basis: fundResponse.data.basis,
           fundedTransaction: fundResponse.data.transaction,
           toSign,
         }

apps/walletd/lib/signLedger.spec.ts

@@ -17,8 +17,8 @@ describe('signLedger', () => {
           device,
           transaction: mocks.walletFundResponse.transaction,
           toSign: mocks.walletFundResponse.toSign,
-          siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-          siafundOutputs: mocks.walletOutputsSiafundResponse,
+          siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+          siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
           addresses: getMockAddresses(mocks),
         })
       ).toMatchSnapshot()
@@ -31,8 +31,8 @@ describe('signLedger', () => {
         await signTransactionLedger({
           device,
           transaction: mocks.walletFundResponse.transaction,
-          siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-          siafundOutputs: mocks.walletOutputsSiafundResponse,
+          siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+          siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
           addresses: getMockAddresses(mocks),
           toSign: [mocks.walletFundResponse.toSign[0], 'not in siacoinOutputs'],
         })
@@ -49,8 +49,8 @@ describe('signLedger', () => {
           device,
           transaction: mocks.walletFundResponse.transaction,
           toSign: mocks.walletFundResponse.toSign,
-          siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-          siafundOutputs: mocks.walletOutputsSiafundResponse,
+          siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+          siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
           addresses: [
             {
               id: 'id',
@@ -75,14 +75,15 @@ describe('signLedger', () => {
           device,
           transaction: mocks.walletFundResponse.transaction,
           toSign: mocks.walletFundResponse.toSign,
-          siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-          siafundOutputs: mocks.walletOutputsSiafundResponse,
+          siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+          siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
           addresses: [
             {
               id: 'id',
               walletId: 'id',
               address:
-                mocks.walletOutputsSiacoinResponse[1].siacoinOutput.address,
+                mocks.walletOutputsSiacoinResponse.outputs[1].siacoinOutput
+                  .address,
               metadata: {},
             },
           ],
@@ -102,8 +103,8 @@ describe('signLedger', () => {
           device,
           transaction: mocks.walletFundResponse.transaction,
           toSign: mocks.walletFundResponse.toSign,
-          siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-          siafundOutputs: mocks.walletOutputsSiafundResponse,
+          siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+          siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
           addresses,
         })
       ).toEqual({

apps/walletd/lib/signSeed.spec.ts

@@ -17,8 +17,8 @@ describe('signSeed', () => {
         toSign: mocks.walletFundResponse.toSign,
         consensusState: mocks.consensusState,
         consensusNetwork: mocks.consensusNetwork,
-        siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-        siafundOutputs: mocks.walletOutputsSiafundResponse,
+        siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+        siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
         addresses: getMockAddresses(mocks),
       })
     ).toMatchSnapshot()
@@ -32,8 +32,8 @@ describe('signSeed', () => {
         transaction: mocks.walletFundResponse.transaction,
         consensusState: mocks.consensusState,
         consensusNetwork: mocks.consensusNetwork,
-        siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-        siafundOutputs: mocks.walletOutputsSiafundResponse,
+        siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+        siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
         addresses: getMockAddresses(mocks),
         toSign: ['not in siacoinOutputs'],
       })
@@ -51,8 +51,8 @@ describe('signSeed', () => {
         toSign: mocks.walletFundResponse.toSign,
         consensusState: mocks.consensusState,
         consensusNetwork: mocks.consensusNetwork,
-        siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-        siafundOutputs: mocks.walletOutputsSiafundResponse,
+        siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+        siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
         addresses: [
           {
             id: 'id',
@@ -78,14 +78,15 @@ describe('signSeed', () => {
         toSign: mocks.walletFundResponse.toSign,
         consensusState: mocks.consensusState,
         consensusNetwork: mocks.consensusNetwork,
-        siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-        siafundOutputs: mocks.walletOutputsSiafundResponse,
+        siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+        siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
         addresses: [
           {
             id: 'id',
             walletId: 'id',
             address:
-              mocks.walletOutputsSiacoinResponse[1].siacoinOutput.address,
+              mocks.walletOutputsSiacoinResponse.outputs[1].siacoinOutput
+                .address,
             metadata: {},
           },
         ],
@@ -106,8 +107,8 @@ describe('signSeed', () => {
         toSign: mocks.walletFundResponse.toSign,
         consensusState: mocks.consensusState,
         consensusNetwork: mocks.consensusNetwork,
-        siacoinOutputs: mocks.walletOutputsSiacoinResponse,
-        siafundOutputs: mocks.walletOutputsSiafundResponse,
+        siacoinOutputs: mocks.walletOutputsSiacoinResponse.outputs,
+        siafundOutputs: mocks.walletOutputsSiafundResponse.outputs,
         addresses,
       })
     ).toEqual({

libs/types/src/v2.ts

@@ -11,9 +11,13 @@ import {
   SiafundOutput,
   Signature,
   StateElement,
+  UnlockConditions,
 } from './core'
 
-export type SpendPolicy = string
+export type SpendPolicy = {
+  type: 'uc'
+  policy: UnlockConditions
+}
 
 export type V2SiacoinInput = {
   parent: SiacoinElement

libs/walletd-js/src/index.ts

@@ -47,6 +47,12 @@ import {
   WalletBalanceParams,
   WalletBalancePayload,
   WalletBalanceResponse,
+  WalletConstructV1TransactionParams,
+  WalletConstructV1TransactionPayload,
+  WalletConstructV1TransactionResponse,
+  WalletConstructV2TransactionParams,
+  WalletConstructV2TransactionPayload,
+  WalletConstructV2TransactionResponse,
   WalletDeleteParams,
   WalletDeletePayload,
   WalletDeleteResponse,
@@ -93,6 +99,8 @@ import {
   walletsIdAddressesAddrRoute,
   walletsIdAddressesRoute,
   walletsIdBalanceRoute,
+  walletsIdConstructTransactionRoute,
+  walletsIdConstructV2TransactionRoute,
   walletsIdEventsRoute,
   walletsIdEventsUnconfirmedRoute,
   walletsIdFundRoute,
@@ -245,5 +253,15 @@ export function Walletd({ api, password }: { api: string; password?: string }) {
       WalletReleasePayload,
       WalletReleaseResponse
     >(axios, 'post', walletsIdReleaseRoute),
+    walletConstructV1Transaction: buildRequestHandler<
+      WalletConstructV1TransactionParams,
+      WalletConstructV1TransactionPayload,
+      WalletConstructV1TransactionResponse
+    >(axios, 'post', walletsIdConstructTransactionRoute),
+    walletConstructV2Transaction: buildRequestHandler<
+      WalletConstructV2TransactionParams,
+      WalletConstructV2TransactionPayload,
+      WalletConstructV2TransactionResponse
+    >(axios, 'post', walletsIdConstructV2TransactionRoute),
   }
 }