Skip to content

Commit 8cb892c

Browse files
committed
feat: update import paths for wasm-utxo
Update imports to use specific module paths from wasm-utxo package. Replace direct imports with explicit paths to the implementation classes. Co-authored-by: llm-git <llm-git@ttll.de> Ticket: BTC-2652 TICKET: BTC-2652
1 parent cab3c31 commit 8cb892c

File tree

12 files changed

+27
-12
lines changed

12 files changed

+27
-12
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as t from 'io-ts';
2-
import { Descriptor, DescriptorPkType } from '@bitgo/wasm-utxo';
2+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
33
import { BIP32Interface, networks } from '@bitgo/utxo-lib';
44
import { signMessage, verifyMessage } from '@bitgo/sdk-core';
55

@@ -37,6 +37,8 @@ export function createNamedDescriptorWithSignature(
3737
return { name, value, signatures: [signature] };
3838
}
3939

40+
export type DescriptorPkType = 'derivable' | 'definite' | 'string';
41+
4042
export function toNamedDescriptorNative(e: NamedDescriptor, pkType: DescriptorPkType): NamedDescriptorNative {
4143
return { ...e, value: Descriptor.fromString(e.value, pkType) };
4244
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 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 { DescriptorMap } from '@bitgo/utxo-core/descriptor';
66

77
import { UtxoCoinSpecific, VerifyAddressOptions } from '../abstractUtxoCoin';

modules/abstract-utxo/src/descriptor/builder/builder.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 { Descriptor } from '@bitgo/wasm-utxo';
2+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
33

44
type DescriptorWithKeys<TName extends string> = {
55
name: TName;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
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 { DescriptorBuilder, getDescriptorFromBuilder } from './builder';
55

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
export { Miniscript, Descriptor } from '@bitgo/wasm-utxo';
1+
export {
2+
WrapMiniscript as Miniscript,
3+
WrapDescriptor as Descriptor,
4+
} from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
25
export { DescriptorMap } from '@bitgo/utxo-core/descriptor';
36
export { assertDescriptorWalletAddress } from './assertDescriptorWalletAddress';
47
export {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 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 {
66
getDefaultXPubs,
77
getDescriptor,

modules/utxo-bin/src/ScriptParser.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as utxolib from '@bitgo/utxo-lib';
2-
import { Miniscript } from '@bitgo/wasm-utxo';
2+
// eslint-disable-next-line import/no-internal-modules
3+
import { WrapMiniscript as Miniscript } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
34

45
import { Parser, ParserNode } from './Parser';
56
import { parseUnknown } from './parseUnknown';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as utxolib from '@bitgo/utxo-lib';
2-
import { Descriptor } from '@bitgo/wasm-utxo';
2+
// eslint-disable-next-line import/no-internal-modules
3+
import { WrapDescriptor as Descriptor } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
34
import * as yargs from 'yargs';
45

56
import { toUtxoPsbt, toWrappedPsbt } from './wrap';

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import * as yargs from 'yargs';
22
import * as utxolib from '@bitgo/utxo-lib';
33
import { Dimensions } from '@bitgo/unspents';
44
import { Buffer } from 'buffer';
5-
import { Descriptor, Miniscript } from '@bitgo/wasm-utxo';
5+
/* eslint-disable import/no-internal-modules */
6+
import {
7+
WrapDescriptor as Descriptor,
8+
WrapMiniscript as Miniscript,
9+
} from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
10+
/* eslint-enable import/no-internal-modules */
611

712
import { withPsbt, withPsbtOptions, WithPsbtOptions } from './withPsbt';
813

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as utxolib from '@bitgo/utxo-lib';
2-
import { Psbt } from '@bitgo/wasm-utxo';
2+
// eslint-disable-next-line import/no-internal-modules
3+
import { WrapPsbt as Psbt } from '@bitgo/wasm-utxo/dist/node/js/wasm/wasm_utxo';
34

45
export function toWrappedPsbt(psbt: utxolib.bitgo.UtxoPsbt | utxolib.Psbt | Buffer | Uint8Array): Psbt {
56
if (psbt instanceof utxolib.bitgo.UtxoPsbt || psbt instanceof utxolib.Psbt) {

0 commit comments

Comments
 (0)