diff --git a/modules/abstract-utxo/package.json b/modules/abstract-utxo/package.json index 50bb27ab70..a40cfcc427 100644 --- a/modules/abstract-utxo/package.json +++ b/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", diff --git a/modules/abstract-utxo/src/descriptor/NamedDescriptor.ts b/modules/abstract-utxo/src/descriptor/NamedDescriptor.ts index d9d2773e23..f00ad30678 100644 --- a/modules/abstract-utxo/src/descriptor/NamedDescriptor.ts +++ b/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'; diff --git a/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts b/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts index 9c9bc41128..cc05e572bc 100644 --- a/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts +++ b/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'; diff --git a/modules/abstract-utxo/src/descriptor/builder/builder.ts b/modules/abstract-utxo/src/descriptor/builder/builder.ts index dcc44c4f60..2f811e40dd 100644 --- a/modules/abstract-utxo/src/descriptor/builder/builder.ts +++ b/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 = { name: TName; diff --git a/modules/abstract-utxo/src/descriptor/builder/parse.ts b/modules/abstract-utxo/src/descriptor/builder/parse.ts index ca5c6f8fbc..ce2680ca3c 100644 --- a/modules/abstract-utxo/src/descriptor/builder/parse.ts +++ b/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'; diff --git a/modules/abstract-utxo/src/descriptor/index.ts b/modules/abstract-utxo/src/descriptor/index.ts index 8f37cea966..d655525e21 100644 --- a/modules/abstract-utxo/src/descriptor/index.ts +++ b/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 { diff --git a/modules/abstract-utxo/test/unit/transaction/descriptor/parse.ts b/modules/abstract-utxo/test/unit/transaction/descriptor/parse.ts index f4120329b8..8a99c40803 100644 --- a/modules/abstract-utxo/test/unit/transaction/descriptor/parse.ts +++ b/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, diff --git a/modules/utxo-bin/package.json b/modules/utxo-bin/package.json index e01392edc5..54cccede53 100644 --- a/modules/utxo-bin/package.json +++ b/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", diff --git a/modules/utxo-bin/src/ScriptParser.ts b/modules/utxo-bin/src/ScriptParser.ts index af40f8350b..0c1e832db6 100644 --- a/modules/utxo-bin/src/ScriptParser.ts +++ b/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'; diff --git a/modules/utxo-bin/src/commands/cmdPsbt/cmdAddDescriptorInput.ts b/modules/utxo-bin/src/commands/cmdPsbt/cmdAddDescriptorInput.ts index 61a6ca12f4..3d0099a05d 100644 --- a/modules/utxo-bin/src/commands/cmdPsbt/cmdAddDescriptorInput.ts +++ b/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'; diff --git a/modules/utxo-bin/src/commands/cmdPsbt/cmdAddOutput.ts b/modules/utxo-bin/src/commands/cmdPsbt/cmdAddOutput.ts index cd2dfe0617..3e4726ec0c 100644 --- a/modules/utxo-bin/src/commands/cmdPsbt/cmdAddOutput.ts +++ b/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'; diff --git a/modules/utxo-bin/src/commands/cmdPsbt/wrap.ts b/modules/utxo-bin/src/commands/cmdPsbt/wrap.ts index b5a24c17de..d3c925a540 100644 --- a/modules/utxo-bin/src/commands/cmdPsbt/wrap.ts +++ b/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) { diff --git a/modules/utxo-bin/src/generateAddress.ts b/modules/utxo-bin/src/generateAddress.ts index b2c648f0ba..127d7fc053 100644 --- a/modules/utxo-bin/src/generateAddress.ts +++ b/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'; diff --git a/modules/utxo-bin/test/cmdPsbt.ts b/modules/utxo-bin/test/cmdPsbt.ts index ce18926232..6a051ce8fd 100644 --- a/modules/utxo-bin/test/cmdPsbt.ts +++ b/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'; diff --git a/modules/utxo-core/package.json b/modules/utxo-core/package.json index 1cfb4e2396..1816e07c22 100644 --- a/modules/utxo-core/package.json +++ b/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/bip174@3.1.0-master.4", "bitcoinjs-message": "npm:@bitgo-forks/bitcoinjs-message@1.0.0-master.3", "fast-sha256": "^1.3.0" diff --git a/modules/utxo-core/src/descriptor/DescriptorMap.ts b/modules/utxo-core/src/descriptor/DescriptorMap.ts index 4be02ee72d..e7484185e6 100644 --- a/modules/utxo-core/src/descriptor/DescriptorMap.ts +++ b/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; diff --git a/modules/utxo-core/src/descriptor/Output.ts b/modules/utxo-core/src/descriptor/Output.ts index 9d2f5b875f..085e703c72 100644 --- a/modules/utxo-core/src/descriptor/Output.ts +++ b/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'; diff --git a/modules/utxo-core/src/descriptor/VirtualSize.ts b/modules/utxo-core/src/descriptor/VirtualSize.ts index 01af5369a1..fc04f9c38f 100644 --- a/modules/utxo-core/src/descriptor/VirtualSize.ts +++ b/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'; diff --git a/modules/utxo-core/src/descriptor/address.ts b/modules/utxo-core/src/descriptor/address.ts index 84ab36e953..5e01e33bcf 100644 --- a/modules/utxo-core/src/descriptor/address.ts +++ b/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 { diff --git a/modules/utxo-core/src/descriptor/derive.ts b/modules/utxo-core/src/descriptor/derive.ts index 6dbf46f470..2d7f6fc395 100644 --- a/modules/utxo-core/src/descriptor/derive.ts +++ b/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. diff --git a/modules/utxo-core/src/descriptor/fromFixedScriptWallet.ts b/modules/utxo-core/src/descriptor/fromFixedScriptWallet.ts index b79ba658ae..4b72622d1c 100644 --- a/modules/utxo-core/src/descriptor/fromFixedScriptWallet.ts +++ b/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 { diff --git a/modules/utxo-core/src/descriptor/psbt/assertSatisfiable.ts b/modules/utxo-core/src/descriptor/psbt/assertSatisfiable.ts index 46e7eefbb9..bfbe52afc9 100644 --- a/modules/utxo-core/src/descriptor/psbt/assertSatisfiable.ts +++ b/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; diff --git a/modules/utxo-core/src/descriptor/psbt/createPsbt.ts b/modules/utxo-core/src/descriptor/psbt/createPsbt.ts index 996ef3905e..b33fafd90c 100644 --- a/modules/utxo-core/src/descriptor/psbt/createPsbt.ts +++ b/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'; diff --git a/modules/utxo-core/src/descriptor/psbt/findDescriptors.ts b/modules/utxo-core/src/descriptor/psbt/findDescriptors.ts index 8326165a50..30c811cec2 100644 --- a/modules/utxo-core/src/descriptor/psbt/findDescriptors.ts +++ b/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'; diff --git a/modules/utxo-core/src/descriptor/psbt/parse.ts b/modules/utxo-core/src/descriptor/psbt/parse.ts index 6e9822efbc..21d39b6fff 100644 --- a/modules/utxo-core/src/descriptor/psbt/parse.ts +++ b/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'; diff --git a/modules/utxo-core/src/descriptor/psbt/sign.ts b/modules/utxo-core/src/descriptor/psbt/sign.ts index eba37f564c..fd1089efd5 100644 --- a/modules/utxo-core/src/descriptor/psbt/sign.ts +++ b/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; diff --git a/modules/utxo-core/src/descriptor/psbt/wrap.ts b/modules/utxo-core/src/descriptor/psbt/wrap.ts index c94699e6f5..5a387c4315 100644 --- a/modules/utxo-core/src/descriptor/psbt/wrap.ts +++ b/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 { diff --git a/modules/utxo-core/src/testutil/descriptor/descriptors.ts b/modules/utxo-core/src/testutil/descriptor/descriptors.ts index 21a58501bf..8e1790e9f2 100644 --- a/modules/utxo-core/src/testutil/descriptor/descriptors.ts +++ b/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'; diff --git a/modules/utxo-core/src/testutil/descriptor/mock.utils.ts b/modules/utxo-core/src/testutil/descriptor/mock.utils.ts index 487da08fc1..132a2fc3ac 100644 --- a/modules/utxo-core/src/testutil/descriptor/mock.utils.ts +++ b/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 { diff --git a/modules/utxo-core/test/descriptor/fromFixedScriptWallet.ts b/modules/utxo-core/test/descriptor/fromFixedScriptWallet.ts index a1a100162f..8c46ecd199 100644 --- a/modules/utxo-core/test/descriptor/fromFixedScriptWallet.ts +++ b/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, diff --git a/modules/utxo-core/test/descriptor/parse/PatternMatcher.ts b/modules/utxo-core/test/descriptor/parse/PatternMatcher.ts index 3e82020c54..33981012fb 100644 --- a/modules/utxo-core/test/descriptor/parse/PatternMatcher.ts +++ b/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'; diff --git a/modules/utxo-core/test/descriptor/psbt/assertSatisfiable.ts b/modules/utxo-core/test/descriptor/psbt/assertSatisfiable.ts index 4263ae88dd..f93cf341a3 100644 --- a/modules/utxo-core/test/descriptor/psbt/assertSatisfiable.ts +++ b/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'; diff --git a/modules/utxo-core/test/descriptor/psbt/psbt.ts b/modules/utxo-core/test/descriptor/psbt/psbt.ts index 76d7890db5..00c0072da5 100644 --- a/modules/utxo-core/test/descriptor/psbt/psbt.ts +++ b/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'; diff --git a/modules/utxo-staking/package.json b/modules/utxo-staking/package.json index 916e2656dd..d23bee8e92 100644 --- a/modules/utxo-staking/package.json +++ b/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/bip174@3.1.0-master.4", "bip322-js": "^2.0.0", "bitcoinjs-lib": "^6.1.7", diff --git a/modules/utxo-staking/src/babylon/delegationMessage.ts b/modules/utxo-staking/src/babylon/delegationMessage.ts index 89368d5388..50c787205d 100644 --- a/modules/utxo-staking/src/babylon/delegationMessage.ts +++ b/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'; diff --git a/modules/utxo-staking/src/babylon/descriptor.ts b/modules/utxo-staking/src/babylon/descriptor.ts index 2f318b6e8c..a41248e528 100644 --- a/modules/utxo-staking/src/babylon/descriptor.ts +++ b/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 { diff --git a/modules/utxo-staking/src/babylon/parseDescriptor.ts b/modules/utxo-staking/src/babylon/parseDescriptor.ts index 48a7e669ed..16875f54be 100644 --- a/modules/utxo-staking/src/babylon/parseDescriptor.ts +++ b/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'; diff --git a/modules/utxo-staking/src/babylon/undelegation/unbonding.ts b/modules/utxo-staking/src/babylon/undelegation/unbonding.ts index a7503164ec..f828f9398b 100644 --- a/modules/utxo-staking/src/babylon/undelegation/unbonding.ts +++ b/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'; diff --git a/modules/utxo-staking/src/coreDao/descriptor.ts b/modules/utxo-staking/src/coreDao/descriptor.ts index a807731a86..1638edbc37 100644 --- a/modules/utxo-staking/src/coreDao/descriptor.ts +++ b/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. diff --git a/modules/utxo-staking/src/coreDao/transaction.ts b/modules/utxo-staking/src/coreDao/transaction.ts index ad2d8f5618..8b5440f3d4 100644 --- a/modules/utxo-staking/src/coreDao/transaction.ts +++ b/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'; diff --git a/modules/utxo-staking/test/unit/babylon/bug71.ts b/modules/utxo-staking/test/unit/babylon/bug71.ts index 622868cfd3..25532396cb 100644 --- a/modules/utxo-staking/test/unit/babylon/bug71.ts +++ b/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 () { diff --git a/modules/utxo-staking/test/unit/babylon/transactions.ts b/modules/utxo-staking/test/unit/babylon/transactions.ts index 972652fb52..bb453d620a 100644 --- a/modules/utxo-staking/test/unit/babylon/transactions.ts +++ b/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, diff --git a/modules/utxo-staking/test/unit/babylon/undelegation.ts b/modules/utxo-staking/test/unit/babylon/undelegation.ts index 47e3b21d27..b6aa023227 100644 --- a/modules/utxo-staking/test/unit/babylon/undelegation.ts +++ b/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'; diff --git a/modules/utxo-staking/test/unit/coreDao/descriptor.ts b/modules/utxo-staking/test/unit/coreDao/descriptor.ts index 31a736e2a8..466919f94a 100644 --- a/modules/utxo-staking/test/unit/coreDao/descriptor.ts +++ b/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'; diff --git a/modules/utxo-staking/test/unit/coreDao/utils.ts b/modules/utxo-staking/test/unit/coreDao/utils.ts index c96edec608..e34831f3e1 100644 --- a/modules/utxo-staking/test/unit/coreDao/utils.ts +++ b/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 { diff --git a/modules/utxo-staking/test/unit/fixtures.utils.ts b/modules/utxo-staking/test/unit/fixtures.utils.ts index 516528c861..40d9bfb34a 100644 --- a/modules/utxo-staking/test/unit/fixtures.utils.ts +++ b/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'; diff --git a/yarn.lock b/yarn.lock index cac5c26195..ae55292719 100644 --- a/yarn.lock +++ b/yarn.lock @@ -273,6 +273,11 @@ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz" integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow== +"@babel/helper-validator-identifier@^7.28.5": + version "7.28.5" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4" + integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q== + "@babel/helper-validator-option@^7.27.1": version "7.27.1" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz" @@ -288,12 +293,12 @@ "@babel/types" "^7.28.2" "@babel/helpers@^7.28.2", "@babel/helpers@^7.28.3": - version "7.28.3" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz#b83156c0a2232c133d1b535dd5d3452119c7e441" - integrity sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw== + version "7.28.4" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827" + integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w== dependencies: "@babel/template" "^7.27.2" - "@babel/types" "^7.28.2" + "@babel/types" "^7.28.4" "@babel/highlight@^7.10.4": version "7.25.9" @@ -868,9 +873,9 @@ esutils "^2.0.2" "@babel/runtime@7.6.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.20.13", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.9", "@babel/runtime@^7.28.2", "@babel/runtime@^7.7.6": - version "7.28.3" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz#75c5034b55ba868121668be5d5bb31cc64e6e61a" - integrity sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA== + version "7.28.4" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326" + integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ== "@babel/template@^7.27.1", "@babel/template@^7.27.2": version "7.27.2" @@ -902,6 +907,14 @@ "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" +"@babel/types@^7.28.4": + version "7.28.5" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b" + integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA== + dependencies: + "@babel/helper-string-parser" "^7.27.1" + "@babel/helper-validator-identifier" "^7.28.5" + "@babylonlabs-io/babylon-proto-ts@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@babylonlabs-io/babylon-proto-ts/-/babylon-proto-ts-1.0.0.tgz" @@ -955,10 +968,10 @@ monocle-ts "^2.3.13" newtype-ts "^0.3.5" -"@bitgo/wasm-miniscript@2.0.0-beta.7": - version "2.0.0-beta.7" - resolved "https://registry.npmjs.org/@bitgo/wasm-miniscript/-/wasm-miniscript-2.0.0-beta.7.tgz" - integrity sha512-cXHEpksbl/myUVkOUJJFXhvPYLLLt8iujrNK00csGyLYTRafwaO2U2txhwt8nUV2CnZXGsmxci/ZsLGLfdJ/8A== +"@bitgo/wasm-utxo@1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/@bitgo/wasm-utxo/-/wasm-utxo-1.1.0.tgz#80007b2beabebe61690297b08d3a5bb7fa207ae7" + integrity sha512-YVmZEE9DRRcJGEX5IUpaU61/pKmZFWLkMX4IcqbC+NI9zXglpZ/rILZWLToHvf0EjGMdNXNdA5SqdhkdQynRSg== "@brandonblack/musig@^0.0.1-alpha.0": version "0.0.1-alpha.1" @@ -20786,14 +20799,14 @@ web-streams-polyfill@^3.0.3: web3-errors@^1.1.4, web3-errors@^1.2.0: version "1.3.1" - resolved "https://registry.npmjs.org/web3-errors/-/web3-errors-1.3.1.tgz" + resolved "https://registry.npmjs.org/web3-errors/-/web3-errors-1.3.1.tgz#163bc4d869f98614760b683d733c3ed1fb415d98" integrity sha512-w3NMJujH+ZSW4ltIZZKtdbkbyQEvBzyp3JRn59Ckli0Nz4VMsVq8aF1bLWM7A2kuQ+yVEm3ySeNU+7mSRwx7RQ== dependencies: web3-types "^1.10.0" web3-types@^1.10.0, web3-types@^1.5.0, web3-types@^1.6.0: version "1.10.0" - resolved "https://registry.npmjs.org/web3-types/-/web3-types-1.10.0.tgz" + resolved "https://registry.npmjs.org/web3-types/-/web3-types-1.10.0.tgz#41b0b4d2dd75e919d5b6f37bf139e29f445db04e" integrity sha512-0IXoaAFtFc8Yin7cCdQfB9ZmjafrbP6BO0f0KT/khMhXKUpoJ6yShrVhiNpyRBo8QQjuOagsWzwSK2H49I7sbw== web3-utils@4.2.1: @@ -20809,7 +20822,7 @@ web3-utils@4.2.1: web3-validator@^2.0.4: version "2.0.6" - resolved "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.6.tgz" + resolved "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.6.tgz#a0cdaa39e1d1708ece5fae155b034e29d6a19248" integrity sha512-qn9id0/l1bWmvH4XfnG/JtGKKwut2Vokl6YXP5Kfg424npysmtRLe9DgiNBM9Op7QL/aSiaA0TVXibuIuWcizg== dependencies: ethereum-cryptography "^2.0.0" @@ -21490,5 +21503,5 @@ yoctocolors-cjs@^2.1.2: zod@^3.21.4: version "3.25.76" - resolved "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz" + resolved "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34" integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==