Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Sync SDK types #8247

Merged
merged 3 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
activity.direction === ActivityDirection.SelfTransaction
? localize('general.internalTransaction')
: localize(isIncoming ? 'general.fromAddress' : 'general.toAddress', {
values: { account: getSubjectLocaleFromActivity(activity) },
values: { address: getSubjectLocaleFromActivity(activity) },
})

$: amount = getFormattedAmountFromActivity(activity)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
import { CommonOutput, OutputData, OutputResponse, UTXOInput } from '@iota/sdk/out/types'
import { CommonOutput, OutputData, OutputWithMetadata, UTXOInput } from '@iota/sdk/out/types'
import { IWalletState } from '@core/wallet/interfaces'
import { InclusionState, ActivityDirection } from '../../enums'
import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
import { getSenderAddressFromInputs } from '../transactions'
import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
import { get } from 'svelte/store'
import { MILLISECONDS_PER_SECOND } from '@core/utils'

// TODO(2.0) Fix all usages
export function preprocessGroupedOutputs(
outputDatas: OutputData[],
transactionInputs: OutputResponse[],
transactionInputs: OutputWithMetadata[],
wallet: IWalletState
): IProcessedTransaction {
const transactionMetadata = outputDatas[0]?.metadata
const wrappedInputs = convertTransactionOutputResponsesToWrappedOutputs(
transactionMetadata?.included.transactionId,
transactionInputs
)
const wrappedInputs = convertTransactionOutputResponsesToWrappedOutputs(transactionInputs)
const utxoInputs = getUtxoInputsFromWrappedInputs(wrappedInputs)
const direction = getDirectionForOutputs(outputDatas, wrappedInputs, wallet.depositAddress)
const wrappedOutputs = outputDatas.map((outputData) => ({
Expand Down Expand Up @@ -75,25 +71,18 @@ function getDirectionForOutputs(
}
}

function convertTransactionOutputResponsesToWrappedOutputs(
transactionId: string,
outputResponses: OutputResponse[]
): IWrappedOutput[] {
return outputResponses.map((outputResponse) =>
convertTransactionOutputResponseToWrappedOutput(transactionId, outputResponse)
)
function convertTransactionOutputResponsesToWrappedOutputs(outputResponses: OutputWithMetadata[]): IWrappedOutput[] {
return outputResponses.map((outputResponse) => convertTransactionOutputResponseToWrappedOutput(outputResponse))
}

function convertTransactionOutputResponseToWrappedOutput(
transactionId: string,
outputResponse: OutputResponse
): IWrappedOutput {
const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, outputResponse.metadata.outputIndex)
return { outputId, output: outputResponse.output, metadata: outputResponse.metadata }
function convertTransactionOutputResponseToWrappedOutput(outputResponse: OutputWithMetadata): IWrappedOutput {
return {
outputId: outputResponse.metadata.outputId,
output: outputResponse.output,
metadata: outputResponse.metadata,
}
}

function getUtxoInputsFromWrappedInputs(wrappedInputs: IWrappedOutput[]): UTXOInput[] {
return (
wrappedInputs?.map((input) => new UTXOInput(input.metadata?.transactionId, input.metadata?.outputIndex)) ?? []
)
return wrappedInputs?.map((input) => UTXOInput.fromOutputId(input.outputId)) ?? []
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export async function preprocessOutgoingTransaction(
const outputs = convertTransactionsOutputTypesToWrappedOutputs(transactionId, regularTransactionEssence.outputs)

const direction = getDirectionFromOutgoingTransaction(outputs, wallet.depositAddress)
const utxoInputs = regularTransactionEssence.inputs.map((i) => i as UTXOInput)
const inputIds = await Promise.all(
utxoInputs.map((input) => {
const transactionId = input.transactionId
const transactionOutputIndex = input.transactionOutputIndex
regularTransactionEssence.inputs.map((input) => {
const _input = input as UTXOInput
const transactionId = _input.transactionId
const transactionOutputIndex = _input.transactionOutputIndex
return computeOutputId(transactionId, transactionOutputIndex)
})
)
Expand All @@ -33,7 +33,6 @@ export async function preprocessOutgoingTransaction(
time: new Date(Number(transaction.timestamp)),
inclusionState: transaction.inclusionState,
wrappedInputs: <IWrappedOutput[]>inputs,
utxoInputs,
}
}

Expand Down
Loading