feat(utxo-core): accept scriptId instead of chain and index params

Replace chain and index parameters with a scriptId object in
addBip322InputWithChainAndIndex function for better consistency with other
API methods.

BTC-2383

TICKET: BTC-2383

Author: davidkaplanbitgo

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

@@ -79,14 +79,16 @@ export function addBip322InputWithChainAndIndex(
   psbt: Psbt,
   message: string,
   rootWalletKeys: bitgo.RootWalletKeys,
-  chain: bitgo.ChainCode,
-  index: number
+  scriptId: bitgo.ScriptId
 ): Psbt {
-  if (isTaprootChain(chain)) {
+  if (isTaprootChain(scriptId.chain)) {
     throw new Error('BIP322 is not supported for Taproot script types.');
   }
-  const walletKeys = rootWalletKeys.deriveForChainAndIndex(chain, index);
-  const output = bitgo.outputScripts.createOutputScript2of3(walletKeys.publicKeys, bitgo.scriptTypeForChain(chain));
+  const walletKeys = rootWalletKeys.deriveForChainAndIndex(scriptId.chain, scriptId.index);
+  const output = bitgo.outputScripts.createOutputScript2of3(
+    walletKeys.publicKeys,
+    bitgo.scriptTypeForChain(scriptId.chain)
+  );
 
   addBip322Input(psbt, message, {
     scriptPubKey: output.scriptPubKey,
@@ -97,7 +99,7 @@ export function addBip322InputWithChainAndIndex(
   const inputIndex = psbt.data.inputs.length - 1;
   psbt.updateInput(
     inputIndex,
-    bitgo.getPsbtBip32DerivationOutputUpdate(rootWalletKeys, walletKeys, bitgo.scriptTypeForChain(chain))
+    bitgo.getPsbtBip32DerivationOutputUpdate(rootWalletKeys, walletKeys, bitgo.scriptTypeForChain(scriptId.chain))
   );
 
   return psbt;

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

@@ -53,7 +53,7 @@ describe('BIP322 toSign', function () {
         }
         const toSpendTx = bip322.buildToSpendTransactionFromChainAndIndex(rootWalletKeys, chain, index, message);
         const toSignPsbt = bip322.createBaseToSignPsbt(rootWalletKeys);
-        bip322.addBip322InputWithChainAndIndex(toSignPsbt, message, rootWalletKeys, chain, index);
+        bip322.addBip322InputWithChainAndIndex(toSignPsbt, message, rootWalletKeys, { chain, index });
 
         // Can sign the PSBT with the keys
         // Should be able to use HD because we have the bip32Derivation information