Fix rel/latest merge conflicts

Dockerfile

@@ -45,8 +45,6 @@ COPY --from=builder /tmp/bitgo/modules/sdk-opensslbytes /var/modules/sdk-openssl
 COPY --from=builder /tmp/bitgo/modules/secp256k1 /var/modules/secp256k1/
 COPY --from=builder /tmp/bitgo/modules/sjcl /var/modules/sjcl/
 COPY --from=builder /tmp/bitgo/modules/statics /var/modules/statics/
-COPY --from=builder /tmp/bitgo/modules/utxo-core /var/modules/utxo-core/
-COPY --from=builder /tmp/bitgo/modules/unspents /var/modules/unspents/
 COPY --from=builder /tmp/bitgo/modules/utxo-lib /var/modules/utxo-lib/
 COPY --from=builder /tmp/bitgo/modules/blake2b /var/modules/blake2b/
 COPY --from=builder /tmp/bitgo/modules/blake2b-wasm /var/modules/blake2b-wasm/
@@ -55,6 +53,8 @@ COPY --from=builder /tmp/bitgo/modules/abstract-utxo /var/modules/abstract-utxo/
 COPY --from=builder /tmp/bitgo/modules/blockapis /var/modules/blockapis/
 COPY --from=builder /tmp/bitgo/modules/sdk-api /var/modules/sdk-api/
 COPY --from=builder /tmp/bitgo/modules/sdk-hmac /var/modules/sdk-hmac/
+COPY --from=builder /tmp/bitgo/modules/unspents /var/modules/unspents/
+COPY --from=builder /tmp/bitgo/modules/utxo-core /var/modules/utxo-core/
 COPY --from=builder /tmp/bitgo/modules/utxo-ord /var/modules/utxo-ord/
 COPY --from=builder /tmp/bitgo/modules/account-lib /var/modules/account-lib/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-ada /var/modules/sdk-coin-ada/
@@ -143,8 +143,6 @@ cd /var/modules/sdk-opensslbytes && yarn link && \
 cd /var/modules/secp256k1 && yarn link && \
 cd /var/modules/sjcl && yarn link && \
 cd /var/modules/statics && yarn link && \
-cd /var/modules/utxo-core && yarn link && \
-cd /var/modules/unspents && yarn link && \
 cd /var/modules/utxo-lib && yarn link && \
 cd /var/modules/blake2b && yarn link && \
 cd /var/modules/blake2b-wasm && yarn link && \
@@ -153,6 +151,8 @@ cd /var/modules/abstract-utxo && yarn link && \
 cd /var/modules/blockapis && yarn link && \
 cd /var/modules/sdk-api && yarn link && \
 cd /var/modules/sdk-hmac && yarn link && \
+cd /var/modules/unspents && yarn link && \
+cd /var/modules/utxo-core && yarn link && \
 cd /var/modules/utxo-ord && yarn link && \
 cd /var/modules/account-lib && yarn link && \
 cd /var/modules/sdk-coin-ada && yarn link && \
@@ -244,8 +244,6 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/secp256k1 && \
     yarn link @bitgo/sjcl && \
     yarn link @bitgo/statics && \
-    yarn link @bitgo/utxo-core && \
-    yarn link @bitgo/unspents && \
     yarn link @bitgo/utxo-lib && \
     yarn link @bitgo/blake2b && \
     yarn link @bitgo/blake2b-wasm && \
@@ -254,6 +252,8 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/blockapis && \
     yarn link @bitgo/sdk-api && \
     yarn link @bitgo/sdk-hmac && \
+    yarn link @bitgo/unspents && \
+    yarn link @bitgo/utxo-core && \
     yarn link @bitgo/utxo-ord && \
     yarn link @bitgo/account-lib && \
     yarn link @bitgo/sdk-coin-ada && \

modules/abstract-lightning/package.json

@@ -39,7 +39,7 @@
     ]
   },
   "dependencies": {
-    "@bitgo/public-types": "5.43.1",
+    "@bitgo/public-types": "5.63.0",
     "@bitgo/sdk-core": "^36.26.0",
     "@bitgo/statics": "^58.20.0",
     "@bitgo/utxo-lib": "^11.19.0",

modules/abstract-utxo/package.json

@@ -68,7 +68,7 @@
     "@bitgo/utxo-core": "^1.29.0",
     "@bitgo/utxo-lib": "^11.19.0",
     "@bitgo/utxo-ord": "^1.22.21",
-    "@bitgo/wasm-utxo": "1.19.0",
+    "@bitgo/wasm-utxo": "^1.22.0",
     "@types/lodash": "^4.14.121",
     "@types/superagent": "4.1.15",
     "bignumber.js": "^9.0.2",

modules/abstract-utxo/src/abstractUtxoCoin.ts

@@ -4,7 +4,7 @@ import { randomBytes } from 'crypto';
 import _ from 'lodash';
 import * as utxolib from '@bitgo/utxo-lib';
 import { bip32 } from '@bitgo/secp256k1';
-import { bitgo, getMainnet, isMainnet, isTestnet } from '@bitgo/utxo-lib';
+import { bitgo, getMainnet, isMainnet } from '@bitgo/utxo-lib';
 import {
   AddressCoinSpecific,
   BaseCoin,
@@ -76,7 +76,14 @@ import {
   ErrorImplicitExternalOutputs,
 } from './transaction/descriptor/verifyTransaction';
 import { assertDescriptorWalletAddress, getDescriptorMapFromWallet, isDescriptorWallet } from './descriptor';
-import { getChainFromNetwork, getFamilyFromNetwork, getFullNameFromNetwork } from './names';
+import {
+  getFullNameFromCoinName,
+  getMainnetCoinName,
+  getNetworkFromCoinName,
+  isTestnetCoin,
+  UtxoCoinName,
+  UtxoCoinNameMainnet,
+} from './names';
 import { assertFixedScriptWalletAddress } from './address/fixedScript';
 import { isSdkBackend, ParsedTransaction, SdkBackend } from './transaction/types';
 import { decodePsbtWith, encodeTransaction, stringToBufferTryFormats } from './transaction/decode';
@@ -369,42 +376,40 @@ export abstract class AbstractUtxoCoin
   extends BaseCoin
   implements Musig2Participant<utxolib.bitgo.UtxoPsbt>, Musig2Participant<fixedScriptWallet.BitGoPsbt>
 {
+  abstract name: UtxoCoinName;
+
   public altScriptHash?: number;
   public supportAltScriptDestination?: boolean;
   public defaultSdkBackend: SdkBackend = 'utxolib';
   public readonly amountType: 'number' | 'bigint';
-  private readonly _network: utxolib.Network;
 
-  protected constructor(bitgo: BitGoBase, network: utxolib.Network, amountType: 'number' | 'bigint' = 'number') {
+  protected constructor(bitgo: BitGoBase, amountType: 'number' | 'bigint' = 'number') {
     super(bitgo);
-    if (!utxolib.isValidNetwork(network)) {
-      throw new Error(
-        'invalid network: please make sure to use the same version of ' +
-          '@bitgo/utxo-lib as this library when initializing an instance of this class'
-      );
-    }
     this.amountType = amountType;
-    this._network = network;
   }
 
-  get network() {
-    return this._network;
+  /**
+   * @deprecated - will be removed when we drop support for utxolib
+   * Use `name` property instead.
+   */
+  get network(): utxolib.Network {
+    return getNetworkFromCoinName(this.name);
   }
 
-  getChain() {
-    return getChainFromNetwork(this.network);
+  getChain(): UtxoCoinName {
+    return this.name;
   }
 
-  getFamily() {
-    return getFamilyFromNetwork(this.network);
+  getFamily(): UtxoCoinNameMainnet {
+    return getMainnetCoinName(this.name);
   }
 
-  getFullName() {
-    return getFullNameFromNetwork(this.network);
+  getFullName(): string {
+    return getFullNameFromCoinName(this.name);
   }
 
   /** Indicates whether the coin supports a block target */
-  supportsBlockTarget() {
+  supportsBlockTarget(): boolean {
     // FIXME: the SDK does not seem to use this anywhere so it is unclear what the purpose of this method is
     switch (getMainnet(this.network)) {
       case utxolib.networks.bitcoin:
@@ -428,7 +433,7 @@ export abstract class AbstractUtxoCoin
    * Returns the factor between the base unit and its smallest subdivison
    * @return {number}
    */
-  getBaseFactor() {
+  getBaseFactor(): number {
     return 1e8;
   }
 
@@ -466,7 +471,7 @@ export abstract class AbstractUtxoCoin
    * @param {String} pub the pub to be checked
    * @returns {Boolean} is it valid?
    */
-  isValidPub(pub: string) {
+  isValidPub(pub: string): boolean {
     try {
       return bip32.fromBase58(pub).isNeutered();
     } catch (e) {
@@ -545,7 +550,7 @@ export abstract class AbstractUtxoCoin
     }
 
     if (utxolib.bitgo.isPsbt(input)) {
-      return decodePsbtWith(input, this.network, decodeWith);
+      return decodePsbtWith(input, this.name, decodeWith);
     } else {
       if (decodeWith !== 'utxolib') {
         console.error('received decodeWith hint %s, ignoring for legacy transaction', decodeWith);
@@ -687,7 +692,7 @@ export abstract class AbstractUtxoCoin
         throw new Error('keychains must be a triple');
       }
       assertDescriptorWalletAddress(
-        this.network,
+        this.name,
         params,
         getDescriptorMapFromWallet(wallet, toBip32Triple(keychains), getPolicyForEnv(this.bitgo.env))
       );
@@ -704,7 +709,7 @@ export abstract class AbstractUtxoCoin
       throw new Error('missing required param keychains');
     }
 
-    assertFixedScriptWalletAddress(this.network, {
+    assertFixedScriptWalletAddress(this.name, {
       address,
       keychains,
       format: params.format ?? 'base58',
@@ -762,9 +767,9 @@ export abstract class AbstractUtxoCoin
       .send({ psbt: buffer.toString('hex') })
       .result();
     if (psbt instanceof utxolib.bitgo.UtxoPsbt) {
-      return decodePsbtWith(response.psbt, this.network, 'utxolib') as T;
+      return decodePsbtWith(response.psbt, this.name, 'utxolib') as T;
     } else {
-      return decodePsbtWith(response.psbt, this.network, 'wasm-utxo') as T;
+      return decodePsbtWith(response.psbt, this.name, 'wasm-utxo') as T;
     }
   }
 
@@ -861,7 +866,7 @@ export abstract class AbstractUtxoCoin
    * @returns {boolean}
    */
   isBitGoTaintedUnspent<TNumber extends number | bigint>(unspent: Unspent<TNumber>): boolean {
-    return isReplayProtectionUnspent<TNumber>(unspent, this.network);
+    return isReplayProtectionUnspent(unspent, this.name);
   }
 
   /**
@@ -872,7 +877,7 @@ export abstract class AbstractUtxoCoin
   override async explainTransaction<TNumber extends number | bigint = number>(
     params: ExplainTransactionOptions<TNumber>
   ): Promise<TransactionExplanation> {
-    return explainTx(this.decodeTransactionFromPrebuild(params), params, this.network);
+    return explainTx(this.decodeTransactionFromPrebuild(params), params, this.name);
   }
 
   /**
@@ -967,14 +972,14 @@ export abstract class AbstractUtxoCoin
   getDefaultTxFormat(wallet: Wallet, requestedFormat?: TxFormat): TxFormat | undefined {
     // If format is explicitly requested, use it
     if (requestedFormat !== undefined) {
-      if (isTestnet(this.network) && requestedFormat === 'legacy') {
+      if (isTestnetCoin(this.name) && requestedFormat === 'legacy') {
         throw new ErrorDeprecatedTxFormat(requestedFormat);
       }
 
       return requestedFormat;
     }
 
-    if (isTestnet(this.network)) {
+    if (isTestnetCoin(this.name)) {
       return 'psbt-lite';
     }
 
@@ -1056,7 +1061,15 @@ export abstract class AbstractUtxoCoin
   }
 
   /** @inheritDoc */
-  auditDecryptedKey({ multiSigType, publicKey, prv }) {
+  auditDecryptedKey({
+    multiSigType,
+    publicKey,
+    prv,
+  }: {
+    multiSigType: MultisigType;
+    publicKey: string;
+    prv: string;
+  }): void {
     if (multiSigType === 'tss') {
       throw new Error('tss auditing is not supported for this coin');
     }

modules/abstract-utxo/src/address/fixedScript.ts

@@ -12,11 +12,11 @@ import {
   isTriple,
   Triple,
 } from '@bitgo/sdk-core';
-import * as utxolib from '@bitgo/utxo-lib';
 import { bitgo } from '@bitgo/utxo-lib';
-import { bip32 } from '@bitgo/secp256k1';
 import * as wasmUtxo from '@bitgo/wasm-utxo';
 
+import { getNetworkFromCoinName, UtxoCoinName } from '../names';
+
 type ScriptType2Of3 = bitgo.outputScripts.ScriptType2Of3;
 
 export interface FixedScriptAddressCoinSpecific {
@@ -38,44 +38,23 @@ interface GenerateFixedScriptAddressOptions extends GenerateAddressOptions {
   keychains: { pub: string }[];
 }
 
-function canonicalAddress(network: utxolib.Network, address: string, format?: CreateAddressFormat): string {
-  if (format === 'cashaddr') {
-    const script = utxolib.addressFormat.toOutputScriptTryFormats(address, network);
-    return utxolib.addressFormat.fromOutputScriptWithFormat(script, format, network);
-  }
-  // Default to canonical format (base58 for most coins)
-  return utxolib.addressFormat.toCanonicalFormat(address, network);
-}
-
-function supportsAddressType(network: utxolib.Network, addressType: ScriptType2Of3): boolean {
-  return utxolib.bitgo.outputScripts.isSupportedScriptType(network, addressType);
+function supportsAddressType(coinName: UtxoCoinName, addressType: ScriptType2Of3): boolean {
+  const network = getNetworkFromCoinName(coinName);
+  return bitgo.outputScripts.isSupportedScriptType(network, addressType);
 }
 
 export function generateAddressWithChainAndIndex(
-  network: utxolib.Network,
+  coinName: UtxoCoinName,
   keychains: bitgo.RootWalletKeys | Triple<string>,
   chain: bitgo.ChainCode,
   index: number,
   format: CreateAddressFormat | undefined
 ): string {
-  if (utxolib.isTestnet(network)) {
-    // Convert CreateAddressFormat to AddressFormat for wasm-utxo
-    // 'base58' -> 'default', 'cashaddr' -> 'cashaddr'
-    const wasmFormat = format === 'base58' ? 'default' : format;
-    return wasmUtxo.fixedScriptWallet.address(keychains, chain, index, network, wasmFormat);
-  }
-
-  if (!(keychains instanceof bitgo.RootWalletKeys)) {
-    const hdNodes = keychains.map((pub) => bip32.fromBase58(pub));
-    keychains = new bitgo.RootWalletKeys(hdNodes as Triple<utxolib.BIP32Interface>);
-  }
-
-  const addressType = bitgo.scriptTypeForChain(chain);
-
-  const derivedKeys = keychains.deriveForChainAndIndex(chain, index).publicKeys;
-  const { scriptPubKey: outputScript } = utxolib.bitgo.outputScripts.createOutputScript2of3(derivedKeys, addressType);
-  const address = utxolib.address.fromOutputScript(outputScript, network);
-  return canonicalAddress(network, address, format);
+  // Convert CreateAddressFormat to AddressFormat for wasm-utxo
+  // 'base58' -> 'default', 'cashaddr' -> 'cashaddr'
+  const wasmFormat = format === 'base58' ? 'default' : format;
+  const network = getNetworkFromCoinName(coinName);
+  return wasmUtxo.fixedScriptWallet.address(keychains, chain, index, network, wasmFormat);
 }
 
 /**
@@ -90,7 +69,7 @@ export function generateAddressWithChainAndIndex(
  * @param params.bech32      {boolean}  Deprecated
  * @returns {string} The generated address
  */
-export function generateAddress(network: utxolib.Network, params: GenerateFixedScriptAddressOptions): string {
+export function generateAddress(coinName: UtxoCoinName, params: GenerateFixedScriptAddressOptions): string {
   let derivationIndex = 0;
   if (_.isInteger(params.index) && (params.index as number) > 0) {
     derivationIndex = params.index as number;
@@ -118,11 +97,11 @@ export function generateAddress(network: utxolib.Network, params: GenerateFixedS
 
   const addressType = params.addressType || convertFlagsToAddressType();
 
-  if (addressType !== utxolib.bitgo.scriptTypeForChain(derivationChain)) {
+  if (addressType !== bitgo.scriptTypeForChain(derivationChain)) {
     throw new AddressTypeChainMismatchError(addressType, derivationChain);
   }
 
-  if (!supportsAddressType(network, addressType)) {
+  if (!supportsAddressType(coinName, addressType)) {
     switch (addressType) {
       case 'p2sh':
         throw new Error(`internal error: p2sh should always be supported`);
@@ -144,7 +123,7 @@ export function generateAddress(network: utxolib.Network, params: GenerateFixedS
   }
 
   return generateAddressWithChainAndIndex(
-    network,
+    coinName,
     keychains.map((k) => k.pub) as Triple<string>,
     derivationChain,
     derivationIndex,
@@ -157,7 +136,7 @@ type Keychain = {
 };
 
 export function assertFixedScriptWalletAddress(
-  network: utxolib.Network,
+  coinName: UtxoCoinName,
   {
     chain,
     index,
@@ -184,7 +163,7 @@ export function assertFixedScriptWalletAddress(
     throw new Error('missing required param keychains');
   }
 
-  const expectedAddress = generateAddress(network, {
+  const expectedAddress = generateAddress(coinName, {
     format,
     addressType: addressType as ScriptType2Of3,
     keychains,