Merge pull request #5476

Author: therealdwright

CODEOWNERS

@@ -24,9 +24,10 @@
 /modules/sdk-core/src/bitgo/lightning/ @BitGo/btc-team
 /modules/unspents/ @BitGo/btc-team
 /modules/utxo-bin/ @BitGo/btc-team
-/modules/utxo-staking/ @BitGo/btc-team
+/modules/utxo-core/ @BitGo/btc-team
 /modules/utxo-lib/ @BitGo/btc-team
 /modules/utxo-ord/ @BitGo/btc-team
+/modules/utxo-staking/ @BitGo/btc-team
 
 # Lightning coin modules
 /modules/abstract-lightning/ @BitGo/btc-team

modules/abstract-utxo/.eslintrc.js

@@ -2,5 +2,6 @@ module.exports = {
   extends: ['../../.eslintrc.json'],
   rules: {
     'import/order': ['error', { 'newlines-between': 'always' }],
+    'import/no-internal-modules': 'off',
   },
 };

modules/abstract-utxo/package.json

@@ -47,12 +47,12 @@
     "@bitgo/sdk-core": "^28.23.0",
     "@bitgo/unspents": "^0.47.17",
     "@bitgo/utxo-lib": "^11.2.1",
+    "@bitgo/utxo-core": "^1.0.0",
     "@bitgo/wasm-miniscript": "^2.0.0-beta.2",
     "@types/bluebird": "^3.5.25",
     "@types/lodash": "^4.14.121",
     "@types/superagent": "4.1.15",
     "bignumber.js": "^9.0.2",
-    "bip174": "npm:@bitgo-forks/[email protected]",
     "bitcoinjs-message": "npm:@bitgo-forks/[email protected]",
     "bluebird": "^3.5.3",
     "debug": "^3.1.0",

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

@@ -2,9 +2,9 @@ import assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
 import { Descriptor } from '@bitgo/wasm-miniscript';
+import { DescriptorMap } from '@bitgo/utxo-core/descriptor';
 
 import { UtxoCoinSpecific, VerifyAddressOptions } from '../abstractUtxoCoin';
-import { DescriptorMap } from '../core/descriptor';
 
 class DescriptorAddressMismatchError extends Error {
   constructor(descriptor: Descriptor, index: number, derivedAddress: string, expectedAddress: string) {

modules/abstract-utxo/src/core/descriptor/signTxLocal.ts

@@ -1,7 +1,7 @@
 import * as t from 'io-ts';
 import { IWallet, WalletCoinSpecific } from '@bitgo/sdk-core';
+import { DescriptorMap } from '@bitgo/utxo-core/descriptor';
 
-import { DescriptorMap } from '../core/descriptor';
 import { UtxoWallet, UtxoWalletData } from '../wallet';
 
 import { NamedDescriptor } from './NamedDescriptor';

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

@@ -1,4 +1,5 @@
 export { Miniscript, Descriptor } from '@bitgo/wasm-miniscript';
+export { DescriptorMap } from '@bitgo/utxo-core/descriptor';
 export { assertDescriptorWalletAddress } from './assertDescriptorWalletAddress';
 export { NamedDescriptor, createNamedDescriptorWithSignature, hasValidSignature } from './NamedDescriptor';
 export { isDescriptorWallet, getDescriptorMapFromWallet } from './descriptorWallet';

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

@@ -1,8 +1,7 @@
 import { Descriptor } from '@bitgo/wasm-miniscript';
 import { EnvironmentName, Triple } from '@bitgo/sdk-core';
 import * as utxolib from '@bitgo/utxo-lib';
-
-import { DescriptorMap, toDescriptorMap } from '../core/descriptor';
+import { DescriptorMap, toDescriptorMap } from '@bitgo/utxo-core/descriptor';
 
 import { parseDescriptor } from './builder';
 import { hasValidSignature, NamedDescriptor } from './NamedDescriptor';

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

@@ -1,15 +1,14 @@
 import * as utxolib from '@bitgo/utxo-lib';
 import * as t from 'io-ts';
 
-import { NamedDescriptor } from '../../descriptor';
+import { DescriptorMap, NamedDescriptor } from '../../descriptor';
 import { OfflineVaultSignable, toKeyTriple } from '../OfflineVaultSignable';
 import {
   getValidatorOneOfTemplates,
   getValidatorSignedByUserKey,
   getValidatorSome,
   toDescriptorMapValidate,
 } from '../../descriptor/validatePolicy';
-import { DescriptorMap } from '../../core/descriptor';
 import { explainPsbt, signPsbt } from '../../transaction/descriptor';
 import { TransactionExplanation } from '../TransactionExplanation';