Skip to content

Commit c6f0d09

Browse files
feat(abstract-utxo): enforce import order lint rule
Issue: BTC-1688
1 parent 0584e14 commit c6f0d09

30 files changed

+90
-60
lines changed

modules/abstract-utxo/.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
extends: ['../../.eslintrc.json'],
3+
rules: {
4+
'import/order': ['error', { 'newlines-between': 'always' }],
5+
},
6+
};

modules/abstract-utxo/src/abstractUtxoCoin.ts

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
import assert from 'assert';
22
import { randomBytes } from 'crypto';
3+
34
import _ from 'lodash';
45
import * as utxolib from '@bitgo/utxo-lib';
56
import { bip32, bitgo, getMainnet, isMainnet, isTestnet } from '@bitgo/utxo-lib';
6-
7-
import {
8-
backupKeyRecovery,
9-
CrossChainRecoverySigned,
10-
CrossChainRecoveryUnsigned,
11-
forCoin,
12-
recoverCrossChain,
13-
RecoverParams,
14-
RecoveryProvider,
15-
v1BackupKeyRecovery,
16-
V1RecoverParams,
17-
v1Sweep,
18-
V1SweepParams,
19-
} from './recovery';
20-
217
import {
228
AddressCoinSpecific,
239
AddressTypeChainMismatchError,
@@ -57,6 +43,20 @@ import {
5743
VerifyTransactionOptions as BaseVerifyTransactionOptions,
5844
Wallet,
5945
} from '@bitgo/sdk-core';
46+
47+
import {
48+
backupKeyRecovery,
49+
CrossChainRecoverySigned,
50+
CrossChainRecoveryUnsigned,
51+
forCoin,
52+
recoverCrossChain,
53+
RecoverParams,
54+
RecoveryProvider,
55+
v1BackupKeyRecovery,
56+
V1RecoverParams,
57+
v1Sweep,
58+
V1SweepParams,
59+
} from './recovery';
6060
import { isReplayProtectionUnspent } from './replayProtection';
6161
import { supportedCrossChainRecoveries } from './config';
6262
import {
@@ -68,7 +68,6 @@ import {
6868
verifyTransaction,
6969
} from './transaction';
7070
import { assertDescriptorWalletAddress, getDescriptorMapFromWallet, isDescriptorWallet } from './descriptor';
71-
7271
import { getChainFromNetwork, getFamilyFromNetwork, getFullNameFromNetwork } from './names';
7372
import { CustomChangeOptions } from './transaction/fixedScript';
7473
import { toBip32Triple, UtxoKeychain, UtxoNamedKeychains } from './keychains';

modules/abstract-utxo/src/core/descriptor/psbt/parse.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as utxolib from '@bitgo/utxo-lib';
33

44
import { DescriptorMap } from '../DescriptorMap';
55
import { getVirtualSize } from '../VirtualSize';
6+
67
import { findDescriptorForInput, findDescriptorForOutput } from './findDescriptors';
78
import { assertSatisfiable } from './assertSatisfiable';
89

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import assert from 'assert';
2+
23
import * as utxolib from '@bitgo/utxo-lib';
34
import { Descriptor } from '@bitgo/wasm-miniscript';
45

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { BIP32Interface } from '@bitgo/utxo-lib';
22
import * as utxolib from '@bitgo/utxo-lib';
33
import { Descriptor } from '@bitgo/wasm-miniscript';
4+
45
import { DescriptorBuilder, getDescriptorFromBuilder } from './builder';
56

67
type NodeUnary<Key extends string> = { [k in Key]: unknown };

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import * as t from 'io-ts';
22
import { IWallet, WalletCoinSpecific } from '@bitgo/sdk-core';
33

4-
import { NamedDescriptor } from './NamedDescriptor';
54
import { DescriptorMap } from '../core/descriptor';
6-
import { DescriptorValidationPolicy, KeyTriple, toDescriptorMapValidate } from './validatePolicy';
75
import { UtxoWallet, UtxoWalletData } from '../wallet';
86

7+
import { NamedDescriptor } from './NamedDescriptor';
8+
import { DescriptorValidationPolicy, KeyTriple, toDescriptorMapValidate } from './validatePolicy';
9+
910
type DescriptorWalletCoinSpecific = {
1011
descriptors: NamedDescriptor[];
1112
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { Descriptor } from '@bitgo/wasm-miniscript';
22
import { EnvironmentName, Triple } from '@bitgo/sdk-core';
33
import * as utxolib from '@bitgo/utxo-lib';
44

5+
import { DescriptorMap, toDescriptorMap } from '../core/descriptor';
6+
57
import { DescriptorBuilder, parseDescriptor } from './builder';
68
import { NamedDescriptor } from './NamedDescriptor';
7-
import { DescriptorMap, toDescriptorMap } from '../core/descriptor';
89

910
export type DescriptorValidationPolicy = { allowedTemplates: DescriptorBuilder['name'][] } | 'allowAll';
1011

modules/abstract-utxo/src/keychains.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import assert from 'assert';
2+
23
import * as t from 'io-ts';
34
import * as utxolib from '@bitgo/utxo-lib';
45
import { IRequestTracer, IWallet, KeyIndices, promiseProps, Triple } from '@bitgo/sdk-core';

modules/abstract-utxo/src/recovery/RecoveryProvider.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { BlockchairApi, AddressInfo, TransactionIO } from '@bitgo/blockapis';
2-
import { ApiNotImplementedError } from './baseApi';
32
import { bitgo } from '@bitgo/utxo-lib';
43

4+
import { ApiNotImplementedError } from './baseApi';
5+
56
type Unspent<TNumber extends number | bigint = number> = bitgo.Unspent<TNumber>;
67

78
/**

modules/abstract-utxo/src/recovery/backupKeyRecovery.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
import assert from 'assert';
2+
23
import _ from 'lodash';
34
import * as utxolib from '@bitgo/utxo-lib';
4-
const { getInternalChainCode, scriptTypeForChain, outputScripts, getExternalChainCode } = utxolib.bitgo;
5-
6-
type ChainCode = utxolib.bitgo.ChainCode;
7-
type RootWalletKeys = utxolib.bitgo.RootWalletKeys;
8-
type WalletUnspent<TNumber extends number | bigint> = utxolib.bitgo.WalletUnspent<TNumber>;
9-
type WalletUnspentJSON = utxolib.bitgo.WalletUnspent & {
10-
valueString: string;
11-
};
12-
type ScriptType2Of3 = utxolib.bitgo.outputScripts.ScriptType2Of3;
13-
145
import { VirtualSizes } from '@bitgo/unspents';
15-
166
import {
177
BitGoBase,
188
ErrorNoInputToRecover,
@@ -23,13 +13,24 @@ import {
2313
isTriple,
2414
krsProviders,
2515
} from '@bitgo/sdk-core';
16+
import { getMainnet, networks } from '@bitgo/utxo-lib';
17+
2618
import { AbstractUtxoCoin, MultiSigAddress } from '../abstractUtxoCoin';
19+
import { signAndVerifyPsbt } from '../sign';
2720

2821
import { forCoin, RecoveryProvider } from './RecoveryProvider';
2922
import { MempoolApi } from './mempoolApi';
3023
import { CoingeckoApi } from './coingeckoApi';
31-
import { signAndVerifyPsbt } from '../sign';
32-
import { getMainnet, networks } from '@bitgo/utxo-lib';
24+
25+
type ScriptType2Of3 = utxolib.bitgo.outputScripts.ScriptType2Of3;
26+
type ChainCode = utxolib.bitgo.ChainCode;
27+
type RootWalletKeys = utxolib.bitgo.RootWalletKeys;
28+
type WalletUnspent<TNumber extends number | bigint> = utxolib.bitgo.WalletUnspent<TNumber>;
29+
type WalletUnspentJSON = utxolib.bitgo.WalletUnspent & {
30+
valueString: string;
31+
};
32+
33+
const { getInternalChainCode, scriptTypeForChain, outputScripts, getExternalChainCode } = utxolib.bitgo;
3334

3435
export interface OfflineVaultTxInfo {
3536
inputs: WalletUnspentJSON[];

0 commit comments

Comments
 (0)