Skip to content

Commit bded43c

Browse files
refactor(abstract-utxo): move AbstractUtxoCoinWallet to its own file
We want to add more code here Issue: BTC-1450
1 parent f6e5392 commit bded43c

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

modules/abstract-utxo/src/abstractUtxoCoin.ts

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,30 @@ import {
5757
VerifyAddressOptions as BaseVerifyAddressOptions,
5858
VerifyTransactionOptions as BaseVerifyTransactionOptions,
5959
Wallet,
60-
WalletData,
6160
} from '@bitgo/sdk-core';
6261
import { isReplayProtectionUnspent } from './replayProtection';
6362
import { signAndVerifyPsbt, signAndVerifyWalletTransaction } from './sign';
6463
import { supportedCrossChainRecoveries } from './config';
6564
import {
6665
assertValidTransactionRecipient,
6766
explainTx,
68-
parseTransaction,
69-
verifyTransaction,
7067
fromExtendedAddressFormat,
7168
isScriptRecipient,
69+
parseTransaction,
70+
verifyTransaction,
7271
} from './transaction';
7372
import { assertDescriptorWalletAddress, getDescriptorMapFromWallet, isDescriptorWallet } from './descriptor';
7473

7574
import { getChainFromNetwork, getFamilyFromNetwork, getFullNameFromNetwork } from './names';
7675
import { CustomChangeOptions } from './transaction/fixedScript';
7776
import { toBip32Triple, UtxoKeychain, UtxoNamedKeychains } from './keychains';
77+
import { verifyKeySignature, verifyUserPublicKey } from './verifyKey';
78+
import { getPolicyForEnv } from './descriptor/validatePolicy';
79+
import { AbstractUtxoCoinWallet } from './wallet';
7880

7981
const debug = debugLib('bitgo:v2:utxo');
8082

8183
import ScriptType2Of3 = utxolib.bitgo.outputScripts.ScriptType2Of3;
82-
import { verifyKeySignature, verifyUserPublicKey } from './verifyKey';
83-
import { getPolicyForEnv } from './descriptor/validatePolicy';
8484

8585
type UtxoCustomSigningFunction<TNumber extends number | bigint> = {
8686
(params: {
@@ -198,23 +198,6 @@ export interface TransactionParams extends BaseTransactionParams {
198198
rbfTxIds?: string[];
199199
}
200200

201-
// parseTransactions' return type makes use of WalletData's type but with customChangeKeySignatures as required.
202-
export interface AbstractUtxoCoinWalletData extends WalletData {
203-
customChangeKeySignatures: {
204-
user: string;
205-
backup: string;
206-
bitgo: string;
207-
};
208-
}
209-
210-
export class AbstractUtxoCoinWallet extends Wallet {
211-
public _wallet: AbstractUtxoCoinWalletData;
212-
213-
constructor(bitgo: BitGoBase, baseCoin: IBaseCoin, walletData: any) {
214-
super(bitgo, baseCoin, walletData);
215-
}
216-
}
217-
218201
export interface ParseTransactionOptions<TNumber extends number | bigint = number> extends BaseParseTransactionOptions {
219202
txParams: TransactionParams;
220203
txPrebuild: TransactionPrebuild<TNumber>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { IWallet, WalletCoinSpecific } from '@bitgo/sdk-core';
33

44
import { NamedDescriptor } from './NamedDescriptor';
55
import { DescriptorMap } from '../core/descriptor';
6-
import { AbstractUtxoCoinWalletData } from '../abstractUtxoCoin';
76
import { DescriptorValidationPolicy, KeyTriple, toDescriptorMapValidate } from './validatePolicy';
7+
import { AbstractUtxoCoinWalletData } from '../wallet';
88

99
type DescriptorWalletCoinSpecific = {
1010
descriptors: NamedDescriptor[];
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { BitGoBase, IBaseCoin, Wallet, WalletData } from '@bitgo/sdk-core';
2+
3+
// parseTransactions' return type makes use of WalletData's type but with customChangeKeySignatures as required.
4+
export interface AbstractUtxoCoinWalletData extends WalletData {
5+
customChangeKeySignatures: {
6+
user: string;
7+
backup: string;
8+
bitgo: string;
9+
};
10+
}
11+
12+
export class AbstractUtxoCoinWallet extends Wallet {
13+
public _wallet: AbstractUtxoCoinWalletData;
14+
15+
constructor(bitgo: BitGoBase, baseCoin: IBaseCoin, walletData: any) {
16+
super(bitgo, baseCoin, walletData);
17+
}
18+
}

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

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

0 commit comments

Comments
 (0)