diff --git a/modules/abstract-utxo/src/abstractUtxoCoin.ts b/modules/abstract-utxo/src/abstractUtxoCoin.ts index a0f94a219f..97de3de6ff 100644 --- a/modules/abstract-utxo/src/abstractUtxoCoin.ts +++ b/modules/abstract-utxo/src/abstractUtxoCoin.ts @@ -1,13 +1,10 @@ -/** - * @prettier - */ +import assert from 'assert'; +import { randomBytes } from 'crypto'; +import _ from 'lodash'; import * as utxolib from '@bitgo/utxo-lib'; import { bip32, BIP32Interface, bitgo, getMainnet, isMainnet, isTestnet } from '@bitgo/utxo-lib'; -import * as assert from 'assert'; import * as bitcoinMessage from 'bitcoinjs-message'; -import { randomBytes } from 'crypto'; -import * as debugLib from 'debug'; -import * as _ from 'lodash'; +import debugLib from 'debug'; import BigNumber from 'bignumber.js'; import { diff --git a/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts b/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts index 2828b3c4a4..6bd5a1a47a 100644 --- a/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts +++ b/modules/abstract-utxo/src/descriptor/assertDescriptorWalletAddress.ts @@ -1,4 +1,4 @@ -import * as assert from 'assert'; +import assert from 'assert'; import * as t from 'io-ts'; import * as utxolib from '@bitgo/utxo-lib'; import { Descriptor } from '@bitgo/wasm-miniscript'; diff --git a/modules/abstract-utxo/src/parseOutput.ts b/modules/abstract-utxo/src/parseOutput.ts index 7d2f29ed87..a94ead9a04 100644 --- a/modules/abstract-utxo/src/parseOutput.ts +++ b/modules/abstract-utxo/src/parseOutput.ts @@ -1,9 +1,5 @@ -/** - * @prettier - */ - -import * as debugLib from 'debug'; -import * as _ from 'lodash'; +import debugLib from 'debug'; +import _ from 'lodash'; import { AddressVerificationData, IRequestTracer, diff --git a/modules/abstract-utxo/src/recovery/backupKeyRecovery.ts b/modules/abstract-utxo/src/recovery/backupKeyRecovery.ts index 95520225b5..c38797f384 100644 --- a/modules/abstract-utxo/src/recovery/backupKeyRecovery.ts +++ b/modules/abstract-utxo/src/recovery/backupKeyRecovery.ts @@ -1,9 +1,5 @@ -/** - * @prettier - */ - -import * as assert from 'assert'; -import * as _ from 'lodash'; +import assert from 'assert'; +import _ from 'lodash'; import * as utxolib from '@bitgo/utxo-lib'; const { getInternalChainCode, scriptTypeForChain, outputScripts, getExternalChainCode } = utxolib.bitgo; diff --git a/modules/abstract-utxo/src/recovery/baseApi.ts b/modules/abstract-utxo/src/recovery/baseApi.ts index 2813eb2268..b3d4da445b 100644 --- a/modules/abstract-utxo/src/recovery/baseApi.ts +++ b/modules/abstract-utxo/src/recovery/baseApi.ts @@ -1,7 +1,4 @@ -/** - * @prettier - */ -import * as superagent from 'superagent'; +import superagent from 'superagent'; import { BitGoJsError } from '@bitgo/sdk-core'; export class ApiNotImplementedError extends BitGoJsError { diff --git a/modules/abstract-utxo/src/recovery/coingeckoApi.ts b/modules/abstract-utxo/src/recovery/coingeckoApi.ts index ba5720c39f..768523859b 100644 --- a/modules/abstract-utxo/src/recovery/coingeckoApi.ts +++ b/modules/abstract-utxo/src/recovery/coingeckoApi.ts @@ -1,6 +1,3 @@ -/** - * @prettier - */ import { BaseApi } from './baseApi'; const familyNamesToCoinGeckoIds = new Map() diff --git a/modules/abstract-utxo/src/recovery/crossChainRecovery.ts b/modules/abstract-utxo/src/recovery/crossChainRecovery.ts index 62aab1ba0f..a1fab26144 100644 --- a/modules/abstract-utxo/src/recovery/crossChainRecovery.ts +++ b/modules/abstract-utxo/src/recovery/crossChainRecovery.ts @@ -1,8 +1,4 @@ -/** - * @prettier - */ -import * as Bluebird from 'bluebird'; - +import Bluebird from 'bluebird'; import * as utxolib from '@bitgo/utxo-lib'; import { bip32, BIP32Interface } from '@bitgo/utxo-lib'; diff --git a/modules/abstract-utxo/src/recovery/mempoolApi.ts b/modules/abstract-utxo/src/recovery/mempoolApi.ts index 6d0c64f357..7b5b9ff64b 100644 --- a/modules/abstract-utxo/src/recovery/mempoolApi.ts +++ b/modules/abstract-utxo/src/recovery/mempoolApi.ts @@ -1,7 +1,4 @@ -/** - * @prettier - */ -import * as _ from 'lodash'; +import _ from 'lodash'; import { ApiNotImplementedError, BaseApi } from './baseApi'; diff --git a/modules/abstract-utxo/src/sign.ts b/modules/abstract-utxo/src/sign.ts index 7cde165513..3b458dcc8f 100644 --- a/modules/abstract-utxo/src/sign.ts +++ b/modules/abstract-utxo/src/sign.ts @@ -1,17 +1,17 @@ -/** - * @prettier - */ import * as utxolib from '@bitgo/utxo-lib'; -const { isWalletUnspent, signInputWithUnspent, toOutput } = utxolib.bitgo; -type Unspent = utxolib.bitgo.Unspent; -type RootWalletKeys = utxolib.bitgo.RootWalletKeys; -import * as debugLib from 'debug'; +import debugLib from 'debug'; import { isReplayProtectionUnspent } from './replayProtection'; const debug = debugLib('bitgo:v2:utxo'); +const { isWalletUnspent, signInputWithUnspent, toOutput } = utxolib.bitgo; + +type Unspent = utxolib.bitgo.Unspent; + +type RootWalletKeys = utxolib.bitgo.RootWalletKeys; + type PsbtParsedScriptTypes = | 'p2sh' | 'p2wsh' diff --git a/modules/abstract-utxo/tsconfig.json b/modules/abstract-utxo/tsconfig.json index c015308f02..7403ea33d4 100644 --- a/modules/abstract-utxo/tsconfig.json +++ b/modules/abstract-utxo/tsconfig.json @@ -4,7 +4,7 @@ "outDir": "./dist", "rootDir": "./", "strictPropertyInitialization": false, - "esModuleInterop": false, + "esModuleInterop": true, "typeRoots": ["../../types", "./node_modules/@types", "../../node_modules/@types"] }, "include": ["src/**/*"],