Skip to content

Commit cab3c31

Browse files
committed
feat: update wasm-utxo imports to use wrapped classes
Update imports to use wrapped classes from wasm-utxo's dist/node/js/wasm/wasm_utxo. Also separate ast imports from the main package to use the correct path. Co-authored-by: llm-git <llm-git@ttll.de> Ticket: BTC-2652 TICKET: BTC-2652
1 parent 692ef34 commit cab3c31

12 files changed

Lines changed: 28 additions & 13 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as vendor from '@bitgo/babylonlabs-io-btc-staking-ts';
88
import * as babylonProtobuf from '@babylonlabs-io/babylon-proto-ts';
99
import * as bitcoinjslib from 'bitcoinjs-lib';
1010
import * as utxolib from '@bitgo/utxo-lib';
11-
import { Descriptor } from '@bitgo/wasm-utxo';
11+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
1212
import { toXOnlyPublicKey } from '@bitgo/utxo-core';
1313
import { signWithKey, toWrappedPsbt } from '@bitgo/utxo-core/descriptor';
1414

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* https://github.com/babylonlabs-io/babylon/blob/v1.99.0-snapshot.250211/btcstaking/staking.go
55
*/
66

7-
import { Descriptor, ast } from '@bitgo/wasm-utxo';
7+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
8+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
89
import { StakingParams } from '@bitgo/babylonlabs-io-btc-staking-ts';
910

1011
export function getUnspendableKey(): string {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Descriptor, ast } from '@bitgo/wasm-utxo';
1+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
2+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
23
import { PatternMatcher, Pattern } from '@bitgo/utxo-core/descriptor';
34

45
import { getUnspendableKey } from './descriptor';

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import assert from 'assert';
22

33
import * as utxolib from '@bitgo/utxo-lib';
44
import { PartialSig, WitnessUtxo } from 'bip174/src/lib/interfaces';
5-
import { Descriptor, Miniscript, ast } from '@bitgo/wasm-utxo';
5+
import {
6+
WrapDescriptor as Descriptor,
7+
WrapMiniscript as Miniscript,
8+
} from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
9+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
610
import { findTapLeafScript, toUtxoPsbt, toWrappedPsbt } from '@bitgo/utxo-core/descriptor';
711

812
import { parseStakingDescriptor } from '../parseDescriptor';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BIP32Interface } from '@bitgo/utxo-lib';
2-
import { ast } from '@bitgo/wasm-utxo';
2+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
33

44
/**
55
* Script type for a descriptor.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Output } from '@bitgo/utxo-core';
2-
import { Descriptor } from '@bitgo/wasm-utxo';
2+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
33

44
import { createCoreDaoOpReturnOutputScript, OpReturnParams } from './opReturn';
55

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import assert from 'assert';
33

44
import * as bitcoinjs from 'bitcoinjs-lib';
55
import * as utxolib from '@bitgo/utxo-lib';
6-
import * as wasmMiniscript from '@bitgo/wasm-utxo';
6+
import { WrapPsbt as Psbt } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
77

88
// demonstrate https://github.com/babylonlabs-io/btc-staking-ts/issues/71
99
describe('btc-staking-ts bug #71', function () {
@@ -31,7 +31,7 @@ describe('btc-staking-ts bug #71', function () {
3131
});
3232

3333
it('cannot finalize with wasm-miniscript', function () {
34-
const psbt = wasmMiniscript.Psbt.deserialize(buf);
34+
const psbt = Psbt.deserialize(buf);
3535
assert.throws(() => {
3636
psbt.finalize();
3737
}, /CouldNotSatisfyTr/);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import * as vendor from '@bitgo/babylonlabs-io-btc-staking-ts';
44
import * as bitcoinjslib from 'bitcoinjs-lib';
55
import * as utxolib from '@bitgo/utxo-lib';
66
import { ECPairInterface } from '@bitgo/utxo-lib';
7-
import { ast, Descriptor, Miniscript } from '@bitgo/wasm-utxo';
7+
import {
8+
WrapDescriptor as Descriptor,
9+
WrapMiniscript as Miniscript,
10+
} from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
11+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
812
import {
913
createAddressFromDescriptor,
1014
createPsbt,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import * as t from 'io-ts';
55
import { PathReporter } from 'io-ts/lib/PathReporter';
66
import { isLeft } from 'fp-ts/Either';
77
import * as utxolib from '@bitgo/utxo-lib';
8-
import { ast, Descriptor } from '@bitgo/wasm-utxo';
8+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
9+
import * as ast from '@bitgo/wasm-utxo/dist/node/js/ast';
910
import { PartialSig } from 'bip174/src/lib/interfaces';
1011

1112
import { BabylonDescriptorBuilder } from '../../../src/babylon';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as assert from 'assert';
22

33
import * as utxolib from '@bitgo/utxo-lib';
4-
import { Descriptor } from '@bitgo/wasm-utxo';
4+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
55
import { getFixture } from '@bitgo/utxo-core/testutil';
66

77
import { createMultiSigDescriptor, decodeTimelock } from '../../../src/coreDao';

0 commit comments

Comments
 (0)