chore(utxo-lib): cleaned up index.ts export and psbt formatting

TICKET: BTC-2150

Author: christopher-fong

modules/utxo-core/src/paygo/ExtractAddressPayGoAttestation.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { varuint } from '@bitgo/utxo-lib';
+import { varuint } from 'bitcoinjs-lib/src/bufferutils';
 
 // The signed address will always have the following structure:
 // 0x18Bitcoin Signed Message:\n<varint_length><ENTROPY><ADDRESS><UUID>
@@ -32,7 +32,7 @@ export function extractAddressBufferFromPayGoAttestationProof(message: Buffer):
 
   // we decode the varint of the message which is uint32
   // https://en.bitcoin.it/wiki/Protocol_documentation
-  const varInt = varuint.varuint.decode(message, offset);
+  const varInt = varuint.decode(message, offset);
   assert(varInt);
   offset += 1;
 

modules/utxo-core/src/testutil/generatePayGoAttestationProof.utils.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto';
 
-import { varuint } from '@bitgo/utxo-lib';
+import { varuint } from 'bitcoinjs-lib/src/bufferutils';
 /** We have a mirrored function similar to our hsm that generates our Bitcoin signed
  * message so that we can use for testing. This creates a random entropy as well using
  * the nilUUID structure to construct our uuid buffer and given our address we can
@@ -30,7 +30,7 @@ export function generatePayGoAttestationProof(uuid: string, address: Buffer): Bu
 
   // <VARINT_LENGTH>
   const msgLength = entropyLength + addressBufferLength + uuidBufferLength;
-  const msgLengthBuffer = varuint.varuint.encode(msgLength);
+  const msgLengthBuffer = varuint.encode(msgLength);
 
   // <0x18Bitcoin Signed Message:\n<LENGTH><ENTROPY><ADDRESS><UUID>
   const proofMessage = Buffer.concat([prefixBuffer, msgLengthBuffer, entropy, address, uuidBuffer]);

modules/utxo-lib/src/index.ts

@@ -1,7 +1,5 @@
 export * from 'bitcoinjs-lib';
 
-export * as varuint from 'bitcoinjs-lib/src/bufferutils';
-
 export * as bitgo from './bitgo';
 
 export * as address from './address';

modules/utxo-lib/src/testutil/psbt.ts

@@ -77,10 +77,7 @@ export function toUnspent(
   rootWalletKeys: RootWalletKeys
 ): Unspent<bigint> {
   if (input.scriptType === 'p2shP2pk') {
-    return mockReplayProtectionUnspent(network, input.value, {
-      key: rootWalletKeys['user'],
-      vout: index,
-    });
+    return mockReplayProtectionUnspent(network, input.value, { key: rootWalletKeys['user'], vout: index });
   } else {
     const chain = getInternalChainCode(input.scriptType === 'taprootKeyPathSpend' ? 'p2trMusig2' : input.scriptType);
     return mockWalletUnspent(network, input.value, {
@@ -98,10 +95,7 @@ export function toUnspent(
  * user and backup as signer and cosigner respectively for p2trMusig2.
  * user and bitgo as signer and cosigner respectively for other input script types.
  */
-export function getSigners(inputType: InputScriptType): {
-  signerName: KeyName;
-  cosignerName?: KeyName;
-} {
+export function getSigners(inputType: InputScriptType): { signerName: KeyName; cosignerName?: KeyName } {
   return {
     signerName: 'user',
     cosignerName: inputType === 'p2shP2pk' ? undefined : inputType === 'p2trMusig2' ? 'backup' : 'bitgo',
@@ -144,10 +138,7 @@ export function signPsbtInput(
   if (sign === 'fullsigned' && cosignerName && input.scriptType !== 'p2shP2pk') {
     signPsbt(
       psbt,
-      () =>
-        psbt.signInputHD(inputIndex, rootWalletKeys[cosignerName], {
-          deterministic,
-        }),
+      () => psbt.signInputHD(inputIndex, rootWalletKeys[cosignerName], { deterministic }),
       skipNonWitnessUtxo
     );
   }
@@ -170,11 +161,7 @@ export function signAllPsbtInputs(
 ): void {
   const { signers, deterministic, skipNonWitnessUtxo } = params ?? {};
   inputs.forEach((input, inputIndex) => {
-    signPsbtInput(psbt, input, inputIndex, rootWalletKeys, sign, {
-      signers,
-      deterministic,
-      skipNonWitnessUtxo,
-    });
+    signPsbtInput(psbt, input, inputIndex, rootWalletKeys, sign, { signers, deterministic, skipNonWitnessUtxo });
   });
 }
 
@@ -208,9 +195,7 @@ export function constructPsbt(
     } else {
       const { redeemScript } = createOutputScriptP2shP2pk(rootWalletKeys[signerName].publicKey);
       assert(redeemScript);
-      addReplayProtectionUnspentToPsbt(psbt, u, redeemScript, {
-        skipNonWitnessUtxo,
-      });
+      addReplayProtectionUnspentToPsbt(psbt, u, redeemScript, { skipNonWitnessUtxo });
     }
   });
 
@@ -239,17 +224,10 @@ export function constructPsbt(
   psbt.setAllInputsMusig2NonceHD(rootWalletKeys['user']);
   psbt.setAllInputsMusig2NonceHD(rootWalletKeys['bitgo'], { deterministic });
 
-  signAllPsbtInputs(psbt, inputs, rootWalletKeys, 'halfsigned', {
-    signers,
-    skipNonWitnessUtxo,
-  });
+  signAllPsbtInputs(psbt, inputs, rootWalletKeys, 'halfsigned', { signers, skipNonWitnessUtxo });
 
   if (sign === 'fullsigned') {
-    signAllPsbtInputs(psbt, inputs, rootWalletKeys, sign, {
-      signers,
-      deterministic,
-      skipNonWitnessUtxo,
-    });
+    signAllPsbtInputs(psbt, inputs, rootWalletKeys, sign, { signers, deterministic, skipNonWitnessUtxo });
   }
 
   return psbt;