chore(utxo-core): update verify function

TICKET: BTC-2047

Author: christopher-fong

modules/utxo-core/src/paygo/psbt/PayGoUtils.ts

@@ -1,7 +1,8 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import * as bitcoinMessage from 'bitcoinjs-message';
 import { checkForOutput } from 'bip174/src/lib/utils';
 
+import { verifyMessage } from '../../bip32utils';
+
 import {
   ErrorMultiplePayGoProof,
   ErrorMultiplePayGoProofAtPsbtIndex,
@@ -45,7 +46,7 @@ export function verifyPayGoAddressProof(
   psbt: utxolib.bitgo.UtxoPsbt,
   outputIndex: number,
   uuid: string,
-  msg?: Buffer
+  verificationPubkey: Buffer
 ): void {
   const psbtOutputs = checkForOutput(psbt.data.outputs, outputIndex);
   const stored = utxolib.bitgo.getProprietaryKeyValuesFromUnknownKeyValues(psbtOutputs, {
@@ -75,7 +76,7 @@ export function verifyPayGoAddressProof(
   // We construct our message <ENTROPY><ADDRESS><UUID>
   const message = Buffer.concat([entropy, Buffer.from(addressFromOutput), Buffer.from(uuid)]);
 
-  if (!bitcoinMessage.verify(message, addressFromOutput, signature, utxolib.networks.bitcoin.messagePrefix)) {
+  if (!verifyMessage(message.toString(), verificationPubkey, signature, utxolib.networks.bitcoin)) {
     throw new ErrorPayGoAddressProofFailedVerification();
   }
 }

modules/utxo-core/test/paygo/psbt/PayGoUtils.ts

@@ -2,7 +2,6 @@ import assert from 'assert';
 import crypto from 'crypto';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import * as bitcoinMessage from 'bitcoinjs-message';
 import { decodeProprietaryKey } from 'bip174/src/lib/proprietaryKeyVal';
 import { KeyValue } from 'bip174/src/lib/interfaces';
 import { checkForOutput } from 'bip174/src/lib/utils';
@@ -15,7 +14,7 @@ import {
 } from '../../../src/paygo/psbt/PayGoUtils';
 import { generatePayGoAttestationProof } from '../../../src/testutil/generatePayGoAttestationProof.utils';
 import { parseVaspProof } from '../../../src/testutil/parseVaspProof';
-// import { signMessage } from '../../../src/bip32utils';
+import { signMessage } from '../../../src/bip32utils';
 
 // To construct our PSBTs
 const network = utxolib.networks.bitcoin;
@@ -54,7 +53,7 @@ const addressProofMsgBuffer = parseVaspProof(addressProofBuffer);
 const addressProofEntropy = addressProofMsgBuffer.subarray(0, 65);
 
 // signature with the given msg addressProofBuffer
-const sig = bitcoinMessage.sign(addressProofMsgBuffer, attestationPrvKey!, true);
+const sig = signMessage(addressProofMsgBuffer.toString(), attestationPrvKey!, network);
 
 function getTestPsbt() {
   return utxolib.testutil.constructPsbt(psbtInputs, psbtOutputs, network, rootWalletKeys, 'unsigned');
@@ -82,7 +81,7 @@ describe('addPaygoAddressProof and verifyPaygoAddressProof', () => {
     const proofInPsbt = getPaygoProprietaryKey(output.unknownKeyVals!);
     assert(proofInPsbt.length === 1);
     assert.throws(
-      () => verifyPayGoAddressProof(psbt, 0, '00000000-0000-0000-0000-000000000001'),
+      () => verifyPayGoAddressProof(psbt, 0, '00000000-0000-0000-0000-000000000001', attestationPubKey),
       (e: any) => e.message === 'Cannot verify the paygo address signature with the provided pubkey.'
     );
   });
@@ -92,7 +91,7 @@ describe('addPaygoAddressProof and verifyPaygoAddressProof', () => {
     psbt.addOutput({ script: utxolib.address.toOutputScript(addressToVerify, network), value: BigInt(10000) });
     const outputIndex = psbt.data.outputs.length - 1;
     addPayGoAddressProof(psbt, outputIndex, sig, addressProofEntropy);
-    verifyPayGoAddressProof(psbt, outputIndex, nilUUID, Buffer.from(addressToVerify));
+    verifyPayGoAddressProof(psbt, outputIndex, nilUUID, attestationPubKey);
   });
 
   it('should throw an error if there are multiple PayGo proprietary keys in the PSBT', () => {
@@ -105,7 +104,7 @@ describe('addPaygoAddressProof and verifyPaygoAddressProof', () => {
     assert(proofInPsbt.length !== 0);
     assert(proofInPsbt.length > 1);
     assert.throws(
-      () => verifyPayGoAddressProof(psbt, outputIndex, nilUUID),
+      () => verifyPayGoAddressProof(psbt, outputIndex, nilUUID, attestationPubKey),
       (e: any) => e.message === 'There are multiple paygo address proofs encoded in the PSBT. Something went wrong.'
     );
   });
@@ -115,7 +114,7 @@ describe('verifyPaygoAddressProof', () => {
   it('should throw an error if there is no PayGo address in PSBT', () => {
     const psbt = getTestPsbt();
     assert.throws(
-      () => verifyPayGoAddressProof(psbt, 0, nilUUID),
+      () => verifyPayGoAddressProof(psbt, 0, nilUUID, attestationPubKey),
       (e: any) => e.message === 'There is no paygo address proof encoded in the PSBT at output 0.'
     );
   });