Skip to content

Commit c590792

Browse files
refactor(abstract-utxo): rename AbstractUtxoCoinWallet to UtxoWallet
Issue: BTC-1450
1 parent 7cf4410 commit c590792

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

modules/abstract-utxo/src/abstractUtxoCoin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import { CustomChangeOptions } from './transaction/fixedScript';
7676
import { toBip32Triple, UtxoKeychain, UtxoNamedKeychains } from './keychains';
7777
import { verifyKeySignature, verifyUserPublicKey } from './verifyKey';
7878
import { getPolicyForEnv } from './descriptor/validatePolicy';
79-
import { AbstractUtxoCoinWallet } from './wallet';
79+
import { UtxoWallet } from './wallet';
8080

8181
const debug = debugLib('bitgo:v2:utxo');
8282

@@ -201,7 +201,7 @@ export interface TransactionParams extends BaseTransactionParams {
201201
export interface ParseTransactionOptions<TNumber extends number | bigint = number> extends BaseParseTransactionOptions {
202202
txParams: TransactionParams;
203203
txPrebuild: TransactionPrebuild<TNumber>;
204-
wallet: AbstractUtxoCoinWallet;
204+
wallet: UtxoWallet;
205205
verification?: VerificationOptions;
206206
reqId?: IRequestTracer;
207207
}
@@ -329,7 +329,7 @@ export interface VerifyTransactionOptions<TNumber extends number | bigint = numb
329329
extends BaseVerifyTransactionOptions {
330330
txPrebuild: TransactionPrebuild<TNumber>;
331331
txParams: TransactionParams;
332-
wallet: AbstractUtxoCoinWallet;
332+
wallet: UtxoWallet;
333333
}
334334

335335
export interface SignPsbtRequest {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { IWallet, WalletCoinSpecific } from '@bitgo/sdk-core';
44
import { NamedDescriptor } from './NamedDescriptor';
55
import { DescriptorMap } from '../core/descriptor';
66
import { DescriptorValidationPolicy, KeyTriple, toDescriptorMapValidate } from './validatePolicy';
7-
import { AbstractUtxoCoinWalletData } from '../wallet';
7+
import { UtxoWalletData } from '../wallet';
88

99
type DescriptorWalletCoinSpecific = {
1010
descriptors: NamedDescriptor[];
@@ -16,15 +16,15 @@ function isDescriptorWalletCoinSpecific(obj: unknown): obj is DescriptorWalletCo
1616
);
1717
}
1818

19-
type DescriptorWalletData = AbstractUtxoCoinWalletData & {
19+
type DescriptorWalletData = UtxoWalletData & {
2020
coinSpecific: DescriptorWalletCoinSpecific;
2121
};
2222

2323
interface IDescriptorWallet extends IWallet {
2424
coinSpecific(): WalletCoinSpecific & DescriptorWalletCoinSpecific;
2525
}
2626

27-
export function isDescriptorWalletData(obj: AbstractUtxoCoinWalletData): obj is DescriptorWalletData {
27+
export function isDescriptorWalletData(obj: UtxoWalletData): obj is DescriptorWalletData {
2828
return isDescriptorWalletCoinSpecific(obj.coinSpecific);
2929
}
3030

modules/abstract-utxo/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export * from './recovery';
44
export * from './replayProtection';
55
export * from './sign';
66

7+
export { UtxoWallet } from './wallet';
78
export * as descriptor from './descriptor';
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Wallet, WalletData } from '@bitgo/sdk-core';
22

33
// parseTransactions' return type makes use of WalletData's type but with customChangeKeySignatures as required.
4-
export interface AbstractUtxoCoinWalletData extends WalletData {
4+
export interface UtxoWalletData extends WalletData {
55
customChangeKeySignatures: {
66
user: string;
77
backup: string;
88
bitgo: string;
99
};
1010
}
1111

12-
export interface AbstractUtxoCoinWallet extends Wallet {
13-
_wallet: AbstractUtxoCoinWalletData;
12+
export interface UtxoWallet extends Wallet {
13+
_wallet: UtxoWalletData;
1414
}

modules/abstract-utxo/test/descriptor/descriptorWallet.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import assert from 'assert';
22
import { getDescriptorMapFromWallet, isDescriptorWallet } from '../../src/descriptor';
3-
import { AbstractUtxoCoinWallet } from '../../src/wallet';
3+
import { UtxoWallet } from '../../src/wallet';
44
import { getDefaultXPubs, getDescriptorMap } from '../core/descriptor/descriptor.utils';
55
import { toBip32Triple } from '../../src/keychains';
66

77
describe('isDescriptorWalletData', function () {
88
const descriptorMap = getDescriptorMap('Wsh2Of3');
99
it('should return true for valid DescriptorWalletData', function () {
10-
const wallet: AbstractUtxoCoinWallet = {
10+
const wallet: UtxoWallet = {
1111
coinSpecific() {
1212
return {
1313
descriptors: [...descriptorMap.entries()].map(([name, descriptor]) => ({
@@ -16,7 +16,7 @@ describe('isDescriptorWalletData', function () {
1616
})),
1717
};
1818
},
19-
} as unknown as AbstractUtxoCoinWallet;
19+
} as unknown as UtxoWallet;
2020

2121
assert(isDescriptorWallet(wallet));
2222
assert.strictEqual(

modules/bitgo/test/v2/unit/coins/abstractUtxoCoin.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ import * as sinon from 'sinon';
44
import { Wallet, UnexpectedAddressError, VerificationOptions } from '@bitgo/sdk-core';
55
import { TestBitGo } from '@bitgo/sdk-test';
66
import { BitGo } from '../../../../src/bitgo';
7-
import {
8-
AbstractUtxoCoin,
9-
AbstractUtxoCoinWallet,
10-
Output,
11-
TransactionExplanation,
12-
TransactionParams,
13-
} from '@bitgo/abstract-utxo';
7+
import { AbstractUtxoCoin, UtxoWallet, Output, TransactionExplanation, TransactionParams } from '@bitgo/abstract-utxo';
148

159
describe('Abstract UTXO Coin:', () => {
1610
describe('Parse Transaction:', () => {
@@ -60,7 +54,7 @@ describe('Abstract UTXO Coin:', () => {
6054
const parsedTransaction = await coin.parseTransaction({
6155
txParams,
6256
txPrebuild: { txHex: '' },
63-
wallet: wallet as unknown as AbstractUtxoCoinWallet,
57+
wallet: wallet as unknown as UtxoWallet,
6458
verification,
6559
});
6660

0 commit comments

Comments
 (0)