chore(utxo-core): clean up rebase conflicts

TICKET: BTC-2047

Author: christopher-fong

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

@@ -57,8 +57,6 @@ import { getTaprootOutputKey } from '../taproot';
 import {
   getPsbtInputProprietaryKeyVals,
   getPsbtInputSignatureCount,
-  getPsbtOutputProprietaryKeyVals,
-  ProprietaryKeySearch,
   ProprietaryKeySubtype,
   PSBT_PROPRIETARY_IDENTIFIER,
 } from './PsbtUtil';
@@ -1154,75 +1152,6 @@ export class UtxoPsbt<Tx extends UtxoTransaction<bigint> = UtxoTransaction<bigin
     return this;
   }
 
-  /**
-   * Adds a proprietary key value pair to PSBT output
-   * Default identifier is utf-8 for identifier
-   */
-  addProprietaryKeyValToOutput(outputIndex: number, keyValueData: ProprietaryKeyValue): this {
-    const output = checkForOutput(this.data.outputs, outputIndex);
-    assert(output.unknownKeyVals);
-    return this.addUnknownKeyValToOutput(outputIndex, {
-      key: encodeProprietaryKey(keyValueData.key),
-      value: keyValueData.value
-    })
-  }
-
-  /**
-   * To search any data from proprietary key value against keydata in the PSBT outputs.
-   * Default identifierEncoding is utf-8 for identifier.
-   */
-  getOutputProprietaryKeyVals(outputIndex: number, keySearch?: ProprietaryKeySearch): ProprietaryKeyValue[] {
-    const output = checkForOutput(this.data.outputs, outputIndex);
-    return getPsbtOutputProprietaryKeyVals(output, keySearch);
-  }
-
-  /**
-   * Adds or updates (if exists) proprietary key value pair to PSBT output.
-   * Default identifierEncoding is utf-8 for identifier.
-   */
-  addOrUpdateProprietaryKeyValsToOutput(outputIndex: number, keyValueData: ProprietaryKeyValue): this {
-    const output = checkForOutput(this.data.outputs, outputIndex);
-    const key = encodeProprietaryKey(keyValueData.key);
-    const { value } = keyValueData;
-    if (output.unknownKeyVals?.length) {
-      const ukvIndex = output.unknownKeyVals.findIndex((ukv) => ukv.key.equals(key));
-      if (ukvIndex > -1) {
-        output.unknownKeyVals[ukvIndex] = { key, value };
-        return this;
-      }
-    }
-    this.addUnknownKeyValToOutput(outputIndex, {
-      key,
-      value,
-    });
-    return this;
-  }
-
-  /**
-   * To delete any data from proprietary key value in PSBT output.
-   * Default identifierEncoding is utf-8 for identifier.
-   */
-  deleteProprietaryKeyValsInOutput(outputIndex: number, keysToDelete?: ProprietaryKeySearch): this {
-    const output = checkForOutput(this.data.outputs, outputIndex);
-    if (!output.unknownKeyVals?.length) {
-      return this;
-    }
-    if (keysToDelete && keysToDelete.subtype === undefined && Buffer.isBuffer(keysToDelete.keydata)) {
-      throw new Error('invalid proprietary key search filter combination. subtype is required');
-    }
-    output.unknownKeyVals = output.unknownKeyVals.filter((keyValue, i) => {
-      const key = decodeProprietaryKey(keyValue.key);
-      return !(
-        keysToDelete === undefined ||
-        (keysToDelete.identifier === key.identifier &&
-          (keysToDelete.subtype === undefined ||
-            (keysToDelete.subtype === key.subtype &&
-              (!Buffer.isBuffer(keysToDelete.keydata) || keysToDelete.keydata.equals(key.keydata)))))
-      );
-    });
-    return this;
-  }
-
   private createMusig2NonceForInput(
     inputIndex: number,
     keyPair: BIP32Interface,