chore(utxo-core): bip32utils to sign and verify message

TICKET: BTC-2047

Author: christopher-fong

modules/utxo-core/package.json

@@ -55,7 +55,6 @@
     "@bitgo/utxo-lib": "^11.5.0",
     "@bitgo/wasm-miniscript": "2.0.0-beta.7",
     "bip174": "npm:@bitgo-forks/bip174@3.1.0-master.4",
-    "bitcoinjs-message": "npm:@bitgo-forks/bitcoinjs-message@1.0.0-master.3",
     "lodash": "^4.17.15"
   },
   "devDependencies": {

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

@@ -1,8 +1,8 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import * as bitcoinMessage from 'bitcoinjs-message';
 import { checkForOutput } from 'bip174/src/lib/utils';
 
 import { extractAddressBufferFromPayGoAttestationProof } from '../ExtractAddressPayGoAttestation';
+import { verifyMessage } from '../../bip32utils';
 
 import {
   ErrorMultiplePayGoProof,
@@ -75,15 +75,10 @@ export function verifyPayGoAddressProof(
 
   // It doesn't matter that this is bitcoin or not, we just need to convert the public key buffer into an address format
   // for the verification
-  const messageToVerify = utxolib.address.toBase58Check(
-    utxolib.crypto.hash160(pub),
-    utxolib.networks.bitcoin.pubKeyHash,
-    utxolib.networks.bitcoin
-  );
-
-  if (!bitcoinMessage.verify(message, messageToVerify, signature, utxolib.networks.bitcoin.messagePrefix)) {
+  if (!verifyMessage(message.toString(), pub, signature, utxolib.networks.bitcoin)) {
     throw new ErrorPayGoAddressProofFailedVerification();
   }
+
   // We should be verifying the address that was encoded into our message.
   const addressFromProof = extractAddressBufferFromPayGoAttestationProof(message).toString();
 

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

@@ -1,7 +1,6 @@
 import assert from 'assert';
 
 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';
@@ -13,6 +12,7 @@ import {
   verifyPayGoAddressProof,
 } from '../../../src/paygo/psbt/PayGoUtils';
 import { generatePayGoAttestationProof } from '../../../src/testutil/generatePayGoAttestationProof.utils';
+import { signMessage } from '../../../src/bip32utils';
 
 // To construct our PSBTs
 const network = utxolib.networks.bitcoin;
@@ -47,7 +47,7 @@ const addressToVerify = utxolib.address.toBase58Check(
 // this should be retuning a Buffer
 const addressProofBuffer = generatePayGoAttestationProof(nilUUID, Buffer.from(addressToVerify));
 // signature with the given msg addressProofBuffer
-const sig = bitcoinMessage.sign(addressProofBuffer, attestationPrvKey!, true, network.messagePrefix);
+const sig = signMessage(addressProofBuffer.toString(), attestationPrvKey!, network);
 
 function getTestPsbt() {
   return utxolib.testutil.constructPsbt(psbtInputs, psbtOutputs, network, rootWalletKeys, 'unsigned');