Merge pull request #6703 from BitGo/BTC-2385

change types for functions that dont need to be UtxoPsbt

Author: davidkaplanbitgo

modules/utxo-core/src/bip322/toSign.ts

@@ -46,7 +46,7 @@ export function buildToSignPsbt(message: string, addressDetails: AddressDetails,
   }
 
   // Add the message as a proprietary key value to the PSBT so we can verify it later
-  addBip322ProofMessage(psbt as bitgo.UtxoPsbt, 0, Buffer.from(message));
+  addBip322ProofMessage(psbt, 0, Buffer.from(message));
 
   // Set the output
   psbt.addOutput({

modules/utxo-core/src/bip322/utils.ts

@@ -1,6 +1,6 @@
 import * as utxolib from '@bitgo/utxo-lib';
 
-export function addBip322ProofMessage(psbt: utxolib.bitgo.UtxoPsbt, inputIndex: number, message: Buffer): void {
+export function addBip322ProofMessage(psbt: utxolib.Psbt, inputIndex: number, message: Buffer): void {
   utxolib.bitgo.addProprietaryKeyValuesFromUnknownKeyValues(psbt, 'input', inputIndex, {
     key: {
       identifier: utxolib.bitgo.PSBT_PROPRIETARY_IDENTIFIER,

modules/utxo-lib/src/bitgo/ProprietaryKeyValUtils.ts

@@ -1,6 +1,6 @@
 import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces';
 import { decodeProprietaryKey, encodeProprietaryKey, ProprietaryKey } from 'bip174/src/lib/proprietaryKeyVal';
-import { UtxoPsbt } from './UtxoPsbt';
+import { Psbt } from '../';
 
 /**
  * Psbt proprietary keydata object search fields.
@@ -88,7 +88,7 @@ export function updateProprietaryKeyValuesFromUnknownKeyValues(
 }
 
 export function addProprietaryKeyValuesFromUnknownKeyValues(
-  psbt: UtxoPsbt,
+  psbt: Psbt,
   entry: string,
   index: number,
   keyValueData: ProprietaryKeyValue

modules/utxo-lib/src/bitgo/wallet/Psbt.ts

@@ -5,6 +5,7 @@ import { checkForInput } from 'bip174/src/lib/utils';
 import { BIP32Interface } from 'bip32';
 import * as bs58check from 'bs58check';
 import { UtxoPsbt } from '../UtxoPsbt';
+import { Psbt } from '../../';
 import { UtxoTransaction } from '../UtxoTransaction';
 import {
   createOutputScript2of3,
@@ -495,7 +496,7 @@ export function isTransactionWithKeyPathSpendInput(
  * We do all the matching of the (tap)bip32Derivations masterFingerprint to the fingerprint of the
  * extendedPubkey.
  */
-export function addXpubsToPsbt(psbt: UtxoPsbt, rootWalletKeys: RootWalletKeys): void {
+export function addXpubsToPsbt(psbt: Psbt, rootWalletKeys: RootWalletKeys): void {
   const safeRootWalletKeys = new RootWalletKeys(
     rootWalletKeys.triple.map((bip32) => bip32.neutered()) as Triple<BIP32Interface>,
     rootWalletKeys.derivationPrefixes