diff --git a/modules/abstract-utxo/src/descriptor/descriptorWallet.ts b/modules/abstract-utxo/src/descriptor/descriptorWallet.ts index 691c42e129..3197537766 100644 --- a/modules/abstract-utxo/src/descriptor/descriptorWallet.ts +++ b/modules/abstract-utxo/src/descriptor/descriptorWallet.ts @@ -2,11 +2,12 @@ import * as t from 'io-ts'; import { IWallet, WalletCoinSpecific } from '@bitgo/sdk-core'; import { UtxoWallet, UtxoWalletData } from '../wallet'; -import type { DescriptorMap } from '../wasmUtil'; import { NamedDescriptor } from './NamedDescriptor'; import { DescriptorValidationPolicy, KeyTriple, toDescriptorMapValidate } from './validatePolicy'; +import type { DescriptorMap } from './index'; + type DescriptorWalletCoinSpecific = { descriptors: NamedDescriptor[]; }; diff --git a/modules/abstract-utxo/src/descriptor/index.ts b/modules/abstract-utxo/src/descriptor/index.ts index cf72b63e55..9941f4fcad 100644 --- a/modules/abstract-utxo/src/descriptor/index.ts +++ b/modules/abstract-utxo/src/descriptor/index.ts @@ -1,5 +1,7 @@ +import type { descriptorWallet } from '@bitgo/wasm-utxo'; + export { Miniscript, Descriptor } from '@bitgo/wasm-utxo'; -export type { DescriptorMap } from '../wasmUtil'; +export type DescriptorMap = descriptorWallet.DescriptorMap; export { assertDescriptorWalletAddress } from './assertDescriptorWalletAddress'; export { NamedDescriptor, diff --git a/modules/abstract-utxo/src/descriptor/validatePolicy.ts b/modules/abstract-utxo/src/descriptor/validatePolicy.ts index 0df5f38bf6..0f39c5cf8d 100644 --- a/modules/abstract-utxo/src/descriptor/validatePolicy.ts +++ b/modules/abstract-utxo/src/descriptor/validatePolicy.ts @@ -1,11 +1,11 @@ import { EnvironmentName, Triple } from '@bitgo/sdk-core'; import { bip32, descriptorWallet } from '@bitgo/wasm-utxo'; -import type { DescriptorMap } from '../wasmUtil'; - import { parseDescriptor } from './builder'; import { hasValidSignature, NamedDescriptor, NamedDescriptorNative, toNamedDescriptorNative } from './NamedDescriptor'; +import type { DescriptorMap } from './index'; + export type KeyTriple = Triple; export interface DescriptorValidationPolicy { diff --git a/modules/abstract-utxo/src/transaction/descriptor/explainPsbt.ts b/modules/abstract-utxo/src/transaction/descriptor/explainPsbt.ts index fd68d897d3..f817b14efe 100644 --- a/modules/abstract-utxo/src/transaction/descriptor/explainPsbt.ts +++ b/modules/abstract-utxo/src/transaction/descriptor/explainPsbt.ts @@ -3,7 +3,10 @@ import { Psbt, descriptorWallet } from '@bitgo/wasm-utxo'; import type { TransactionExplanationDescriptor } from '../fixedScript/explainTransaction'; import { UtxoCoinName } from '../../names'; -import { sumValues } from '../../wasmUtil'; + +function sumValues(arr: { value: bigint }[]): bigint { + return arr.reduce((sum, e) => sum + e.value, 0n); +} function toRecipient(output: descriptorWallet.ParsedOutput, coinName: UtxoCoinName): ITransactionRecipient { const address = output.address ?? `scriptPubKey:${Buffer.from(output.script).toString('hex')}`; diff --git a/modules/abstract-utxo/src/transaction/descriptor/index.ts b/modules/abstract-utxo/src/transaction/descriptor/index.ts index 7186ef1205..da6fd8e9e6 100644 --- a/modules/abstract-utxo/src/transaction/descriptor/index.ts +++ b/modules/abstract-utxo/src/transaction/descriptor/index.ts @@ -1,4 +1,4 @@ -export type { DescriptorMap } from '../../wasmUtil'; +export type { DescriptorMap } from '../../descriptor'; export { explainPsbt } from './explainPsbt'; export { parse } from './parse'; export { parseToAmountType } from './parseToAmountType'; diff --git a/modules/abstract-utxo/src/transaction/descriptor/signPsbt.ts b/modules/abstract-utxo/src/transaction/descriptor/signPsbt.ts index 9d067da376..00e0baa1b1 100644 --- a/modules/abstract-utxo/src/transaction/descriptor/signPsbt.ts +++ b/modules/abstract-utxo/src/transaction/descriptor/signPsbt.ts @@ -1,6 +1,6 @@ import { Psbt, descriptorWallet } from '@bitgo/wasm-utxo'; -import type { SignerKey } from '../../wasmUtil'; +type SignerKey = Parameters[1]; export class ErrorUnknownInput extends Error { constructor(public vin: number) {