feat(wasm-utxo): replace wasm-miniscript with wasm-utxo package

modules/abstract-utxo/package.json

@@ -51,7 +51,7 @@
     "@bitgo/utxo-core": "^1.21.3",
     "@bitgo/utxo-lib": "^11.14.0",
     "@bitgo/utxo-ord": "^1.22.11",
-    "@bitgo/wasm-miniscript": "2.0.0-beta.7",
+    "@bitgo/wasm-utxo": "1.1.0",
     "@types/lodash": "^4.14.121",
     "@types/superagent": "4.1.15",
     "bignumber.js": "^9.0.2",

modules/abstract-utxo/src/descriptor/NamedDescriptor.ts

@@ -1,5 +1,5 @@
 import * as t from 'io-ts';
-import { Descriptor, DescriptorPkType } from '@bitgo/wasm-miniscript';
+import { Descriptor, DescriptorPkType } from '@bitgo/wasm-utxo';
 import { BIP32Interface, networks } from '@bitgo/utxo-lib';
 import { signMessage, verifyMessage } from '@bitgo/sdk-core';
 

modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import { DescriptorMap } from '@bitgo/utxo-core/descriptor';
 
 import { UtxoCoinSpecific, VerifyAddressOptions } from '../abstractUtxoCoin';

modules/abstract-utxo/src/descriptor/builder/builder.ts

@@ -1,5 +1,5 @@
 import { BIP32Interface } from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 type DescriptorWithKeys<TName extends string> = {
   name: TName;

modules/abstract-utxo/src/descriptor/builder/parse.ts

@@ -1,5 +1,5 @@
 import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { DescriptorBuilder, getDescriptorFromBuilder } from './builder';
 

modules/abstract-utxo/src/descriptor/index.ts

@@ -1,4 +1,4 @@
-export { Miniscript, Descriptor } from '@bitgo/wasm-miniscript';
+export { Miniscript, Descriptor } from '@bitgo/wasm-utxo';
 export { DescriptorMap } from '@bitgo/utxo-core/descriptor';
 export { assertDescriptorWalletAddress } from './assertDescriptorWalletAddress';
 export {

modules/abstract-utxo/test/unit/transaction/descriptor/parse.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import {
   getDefaultXPubs,
   getDescriptor,

modules/utxo-bin/package.json

@@ -31,7 +31,7 @@
     "@bitgo/unspents": "^0.50.7",
     "@bitgo/utxo-core": "^1.21.3",
     "@bitgo/utxo-lib": "^11.14.0",
-    "@bitgo/wasm-miniscript": "2.0.0-beta.7",
+    "@bitgo/wasm-utxo": "1.1.0",
     "@noble/curves": "1.8.1",
     "archy": "^1.0.0",
     "bech32": "^2.0.0",

modules/utxo-bin/src/ScriptParser.ts

@@ -1,5 +1,5 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { Miniscript } from '@bitgo/wasm-miniscript';
+import { Miniscript } from '@bitgo/wasm-utxo';
 
 import { Parser, ParserNode } from './Parser';
 import { parseUnknown } from './parseUnknown';

modules/utxo-bin/src/commands/cmdPsbt/cmdAddDescriptorInput.ts

@@ -1,5 +1,5 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import * as yargs from 'yargs';
 
 import { toUtxoPsbt, toWrappedPsbt } from './wrap';

modules/utxo-bin/src/commands/cmdPsbt/cmdAddOutput.ts

@@ -2,7 +2,7 @@ import * as yargs from 'yargs';
 import * as utxolib from '@bitgo/utxo-lib';
 import { Dimensions } from '@bitgo/unspents';
 import { Buffer } from 'buffer';
-import { Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 
 import { withPsbt, withPsbtOptions, WithPsbtOptions } from './withPsbt';
 

modules/utxo-bin/src/commands/cmdPsbt/wrap.ts

@@ -1,5 +1,5 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { Psbt } from '@bitgo/wasm-miniscript';
+import { Psbt } from '@bitgo/wasm-utxo';
 
 export function toWrappedPsbt(psbt: utxolib.bitgo.UtxoPsbt | utxolib.Psbt | Buffer | Uint8Array): Psbt {
   if (psbt instanceof utxolib.bitgo.UtxoPsbt || psbt instanceof utxolib.Psbt) {

modules/utxo-bin/src/generateAddress.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { Parser } from './Parser';
 import { parseUnknown } from './parseUnknown';

modules/utxo-bin/test/cmdPsbt.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs/promises';
 
 import yargs from 'yargs';
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { cmdPsbt } from '../src/commands';
 import { formatTreeNoColor, getFixtureString } from './fixtures';

modules/utxo-core/package.json

@@ -55,7 +55,7 @@
     "@bitgo/secp256k1": "^1.7.0",
     "@bitgo/unspents": "^0.50.7",
     "@bitgo/utxo-lib": "^11.14.0",
-    "@bitgo/wasm-miniscript": "2.0.0-beta.7",
+    "@bitgo/wasm-utxo": "1.1.0",
     "bip174": "npm:@bitgo-forks/[email protected]",
     "bitcoinjs-message": "npm:@bitgo-forks/[email protected]",
     "fast-sha256": "^1.3.0"

modules/utxo-core/src/descriptor/DescriptorMap.ts

@@ -1,4 +1,4 @@
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 /** Map from descriptor name to descriptor */
 export type DescriptorMap = Map<string, Descriptor>;

modules/utxo-core/src/descriptor/Output.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { getFixedOutputSum, MaxOutput, Output, PrevOutput } from '../Output';
 

modules/utxo-core/src/descriptor/VirtualSize.ts

@@ -1,6 +1,6 @@
 import * as utxolib from '@bitgo/utxo-lib';
 import { Dimensions, VirtualSizes } from '@bitgo/unspents';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { DescriptorMap } from './DescriptorMap';
 import { findDescriptorForInput } from './psbt';

modules/utxo-core/src/descriptor/address.ts

@@ -1,4 +1,4 @@
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 export function createScriptPubKeyFromDescriptor(descriptor: Descriptor, index: number | undefined): Buffer {

modules/utxo-core/src/descriptor/derive.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 /**
  * Get a descriptor at a specific derivation index.

modules/utxo-core/src/descriptor/fromFixedScriptWallet.ts

@@ -1,5 +1,5 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor, ast } from '@bitgo/wasm-miniscript';
+import { Descriptor, ast } from '@bitgo/wasm-utxo';
 
 /** Expand a template with the given root wallet keys and chain code */
 function expand(rootWalletKeys: utxolib.bitgo.RootWalletKeys, keyIndex: number, chainCode: number): string {

modules/utxo-core/src/descriptor/psbt/assertSatisfiable.ts

@@ -8,7 +8,7 @@
  *
  * The goal is not an exhaustive check, but to catch common mistakes.
  */
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 export const FINAL_SEQUENCE = 0xffffffff;

modules/utxo-core/src/descriptor/psbt/createPsbt.ts

@@ -1,6 +1,6 @@
 import { TapLeafScript } from 'bip174/src/lib/interfaces';
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 
 import { DerivedDescriptorWalletOutput, WithOptDescriptor } from '../Output';
 import { Output } from '../../Output';

modules/utxo-core/src/descriptor/psbt/findDescriptors.ts

@@ -10,7 +10,7 @@ We should take a look at a more robust and standard approach like this: https://
 
  */
 import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { DescriptorMap } from '../DescriptorMap';
 

modules/utxo-core/src/descriptor/psbt/parse.ts

@@ -1,4 +1,4 @@
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 import { DescriptorMap } from '../DescriptorMap';

modules/utxo-core/src/descriptor/psbt/sign.ts

@@ -1,9 +1,9 @@
 import assert from 'assert';
 
 import { BIP32Interface, ECPairInterface } from '@bitgo/secp256k1';
-import { Psbt as WasmPsbt } from '@bitgo/wasm-miniscript';
+import { Psbt as WasmPsbt } from '@bitgo/wasm-utxo';
 
-/** These can be replaced when @bitgo/wasm-miniscript is updated */
+/** These can be replaced when @bitgo/wasm-utxo is updated */
 export type SignPsbtInputResult = { Schnorr: string[] } | { Ecdsa: string[] };
 export type SignPsbtResult = {
   [inputIndex: number]: SignPsbtInputResult;

modules/utxo-core/src/descriptor/psbt/wrap.ts

@@ -1,4 +1,4 @@
-import { Psbt as WasmPsbt } from '@bitgo/wasm-miniscript';
+import { Psbt as WasmPsbt } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 export function toWrappedPsbt(psbt: utxolib.bitgo.UtxoPsbt | utxolib.Psbt | Buffer | Uint8Array): WasmPsbt {

modules/utxo-core/src/testutil/descriptor/descriptors.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import { bip32, BIP32Interface } from '@bitgo/secp256k1';
-import { Miniscript, Descriptor, ast } from '@bitgo/wasm-miniscript';
+import { Miniscript, Descriptor, ast } from '@bitgo/wasm-utxo';
 
 import { DescriptorMap, PsbtParams } from '../../descriptor';
 import { getKeyTriple, Triple, KeyTriple } from '../key.utils';

modules/utxo-core/src/testutil/descriptor/mock.utils.ts

@@ -1,4 +1,4 @@
-import { Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 import {

modules/utxo-core/test/descriptor/fromFixedScriptWallet.ts

@@ -1,7 +1,7 @@
 import * as assert from 'node:assert/strict';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import {
   getDescriptorForScriptType,

modules/utxo-core/test/descriptor/parse/PatternMatcher.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { Descriptor, ast } from '@bitgo/wasm-miniscript';
+import { Descriptor, ast } from '@bitgo/wasm-utxo';
 
 import { getKey } from '../../../src/testutil';
 import { toXOnlyPublicKey } from '../../../src';

modules/utxo-core/test/descriptor/psbt/assertSatisfiable.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { getDefaultXPubs } from '../../../src/testutil/descriptor';
 import { getRequiredLocktime } from '../../../src/descriptor';

modules/utxo-core/test/descriptor/psbt/psbt.ts

@@ -2,7 +2,7 @@ import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
 import { BIP32Interface, ECPair, ECPairInterface } from '@bitgo/utxo-lib';
-import { Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 
 import { PsbtParams, parse, toUtxoPsbt, toWrappedPsbt, ParsedDescriptorTransaction } from '../../../src/descriptor';
 import { getFixture, getKeyTriple } from '../../../src/testutil';

modules/utxo-staking/package.json

@@ -47,7 +47,7 @@
     "@bitgo/babylonlabs-io-btc-staking-ts": "^3.1.0",
     "@bitgo/utxo-core": "^1.21.3",
     "@bitgo/utxo-lib": "^11.14.0",
-    "@bitgo/wasm-miniscript": "2.0.0-beta.7",
+    "@bitgo/wasm-utxo": "1.1.0",
     "bip174": "npm:@bitgo-forks/[email protected]",
     "bip322-js": "^2.0.0",
     "bitcoinjs-lib": "^6.1.7",

modules/utxo-staking/src/babylon/delegationMessage.ts

@@ -8,7 +8,7 @@ import * as vendor from '@bitgo/babylonlabs-io-btc-staking-ts';
 import * as babylonProtobuf from '@babylonlabs-io/babylon-proto-ts';
 import * as bitcoinjslib from 'bitcoinjs-lib';
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import { toXOnlyPublicKey } from '@bitgo/utxo-core';
 import { signWithKey, toWrappedPsbt } from '@bitgo/utxo-core/descriptor';
 

modules/utxo-staking/src/babylon/descriptor.ts

@@ -4,7 +4,7 @@
  * https://github.com/babylonlabs-io/babylon/blob/v1.99.0-snapshot.250211/btcstaking/staking.go
  */
 
-import { Descriptor, ast } from '@bitgo/wasm-miniscript';
+import { Descriptor, ast } from '@bitgo/wasm-utxo';
 import { StakingParams } from '@bitgo/babylonlabs-io-btc-staking-ts';
 
 export function getUnspendableKey(): string {

modules/utxo-staking/src/babylon/parseDescriptor.ts

@@ -1,4 +1,4 @@
-import { Descriptor, ast } from '@bitgo/wasm-miniscript';
+import { Descriptor, ast } from '@bitgo/wasm-utxo';
 import { PatternMatcher, Pattern } from '@bitgo/utxo-core/descriptor';
 
 import { getUnspendableKey } from './descriptor';

modules/utxo-staking/src/babylon/undelegation/unbonding.ts

@@ -2,7 +2,7 @@ import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
 import { PartialSig, WitnessUtxo } from 'bip174/src/lib/interfaces';
-import { Descriptor, Miniscript, ast } from '@bitgo/wasm-miniscript';
+import { Descriptor, Miniscript, ast } from '@bitgo/wasm-utxo';
 import { findTapLeafScript, toUtxoPsbt, toWrappedPsbt } from '@bitgo/utxo-core/descriptor';
 
 import { parseStakingDescriptor } from '../parseDescriptor';

modules/utxo-staking/src/coreDao/descriptor.ts

@@ -1,5 +1,5 @@
 import { BIP32Interface } from '@bitgo/utxo-lib';
-import { ast } from '@bitgo/wasm-miniscript';
+import { ast } from '@bitgo/wasm-utxo';
 
 /**
  * Script type for a descriptor.

modules/utxo-staking/src/coreDao/transaction.ts

@@ -1,5 +1,5 @@
 import { Output } from '@bitgo/utxo-core';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 
 import { createCoreDaoOpReturnOutputScript, OpReturnParams } from './opReturn';
 

modules/utxo-staking/test/unit/babylon/bug71.ts

@@ -3,7 +3,7 @@ import assert from 'assert';
 
 import * as bitcoinjs from 'bitcoinjs-lib';
 import * as utxolib from '@bitgo/utxo-lib';
-import * as wasmMiniscript from '@bitgo/wasm-miniscript';
+import * as wasmMiniscript from '@bitgo/wasm-utxo';
 
 // demonstrate https://github.com/babylonlabs-io/btc-staking-ts/issues/71
 describe('btc-staking-ts bug #71', function () {

modules/utxo-staking/test/unit/babylon/transactions.ts

@@ -4,7 +4,7 @@ import * as vendor from '@bitgo/babylonlabs-io-btc-staking-ts';
 import * as bitcoinjslib from 'bitcoinjs-lib';
 import * as utxolib from '@bitgo/utxo-lib';
 import { ECPairInterface } from '@bitgo/utxo-lib';
-import { ast, Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { ast, Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 import {
   createAddressFromDescriptor,
   createPsbt,

modules/utxo-staking/test/unit/babylon/undelegation.ts

@@ -5,7 +5,7 @@ import * as t from 'io-ts';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import { isLeft } from 'fp-ts/Either';
 import * as utxolib from '@bitgo/utxo-lib';
-import { ast, Descriptor } from '@bitgo/wasm-miniscript';
+import { ast, Descriptor } from '@bitgo/wasm-utxo';
 import { PartialSig } from 'bip174/src/lib/interfaces';
 
 import { BabylonDescriptorBuilder } from '../../../src/babylon';

modules/utxo-staking/test/unit/coreDao/descriptor.ts

@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
-import { Descriptor } from '@bitgo/wasm-miniscript';
+import { Descriptor } from '@bitgo/wasm-utxo';
 import { getFixture } from '@bitgo/utxo-core/testutil';
 
 import { createMultiSigDescriptor, decodeTimelock } from '../../../src/coreDao';

modules/utxo-staking/test/unit/coreDao/utils.ts

@@ -1,4 +1,4 @@
-import { Descriptor, Psbt } from '@bitgo/wasm-miniscript';
+import { Descriptor, Psbt } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 
 export function updateInputWithDescriptor(psbt: utxolib.Psbt, inputIndex: number, descriptor: Descriptor): void {

modules/utxo-staking/test/unit/fixtures.utils.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { ast, Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
+import { ast, Descriptor, Miniscript } from '@bitgo/wasm-utxo';
 import * as utxolib from '@bitgo/utxo-lib';
 import * as bitcoinjslib from 'bitcoinjs-lib';
 import { getFixture } from '@bitgo/utxo-core/testutil';