refactor(abstract-utxo): import descriptor types directly from @bitgo/wasm-utxo

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[];
 };

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,

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<bip32.BIP32Interface>;
 
 export interface DescriptorValidationPolicy {

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')}`;

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';

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<typeof descriptorWallet.signWithKey>[1];
 
 export class ErrorUnknownInput extends Error {
   constructor(public vin: number) {