Merge pull request #7300 from BitGo/BTC-2652.move-abstract-utxo-impl

feat(abstract-utxo): move and reorganize UTXO coin implementations and tests

Author: OttoAllmendinger

Dockerfile

@@ -55,6 +55,7 @@ COPY --from=builder /tmp/bitgo/modules/abstract-utxo /var/modules/abstract-utxo/
 COPY --from=builder /tmp/bitgo/modules/blockapis /var/modules/blockapis/
 COPY --from=builder /tmp/bitgo/modules/sdk-api /var/modules/sdk-api/
 COPY --from=builder /tmp/bitgo/modules/sdk-hmac /var/modules/sdk-hmac/
+COPY --from=builder /tmp/bitgo/modules/utxo-ord /var/modules/utxo-ord/
 COPY --from=builder /tmp/bitgo/modules/account-lib /var/modules/account-lib/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-ada /var/modules/sdk-coin-ada/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-algo /var/modules/sdk-coin-algo/
@@ -122,7 +123,6 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-bch /var/modules/sdk-coin-bch/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-bcha /var/modules/sdk-coin-bcha/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-bsv /var/modules/sdk-coin-bsv/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-btc /var/modules/sdk-coin-btc/
-COPY --from=builder /tmp/bitgo/modules/utxo-ord /var/modules/utxo-ord/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-btg /var/modules/sdk-coin-btg/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-dash /var/modules/sdk-coin-dash/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-doge /var/modules/sdk-coin-doge/
@@ -152,6 +152,7 @@ cd /var/modules/abstract-utxo && yarn link && \
 cd /var/modules/blockapis && yarn link && \
 cd /var/modules/sdk-api && yarn link && \
 cd /var/modules/sdk-hmac && yarn link && \
+cd /var/modules/utxo-ord && yarn link && \
 cd /var/modules/account-lib && yarn link && \
 cd /var/modules/sdk-coin-ada && yarn link && \
 cd /var/modules/sdk-coin-algo && yarn link && \
@@ -219,7 +220,6 @@ cd /var/modules/sdk-coin-bch && yarn link && \
 cd /var/modules/sdk-coin-bcha && yarn link && \
 cd /var/modules/sdk-coin-bsv && yarn link && \
 cd /var/modules/sdk-coin-btc && yarn link && \
-cd /var/modules/utxo-ord && yarn link && \
 cd /var/modules/sdk-coin-btg && yarn link && \
 cd /var/modules/sdk-coin-dash && yarn link && \
 cd /var/modules/sdk-coin-doge && yarn link && \
@@ -252,6 +252,7 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/blockapis && \
     yarn link @bitgo/sdk-api && \
     yarn link @bitgo/sdk-hmac && \
+    yarn link @bitgo/utxo-ord && \
     yarn link @bitgo/account-lib && \
     yarn link @bitgo/sdk-coin-ada && \
     yarn link @bitgo/sdk-coin-algo && \
@@ -319,7 +320,6 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/sdk-coin-bcha && \
     yarn link @bitgo/sdk-coin-bsv && \
     yarn link @bitgo/sdk-coin-btc && \
-    yarn link @bitgo/utxo-ord && \
     yarn link @bitgo/sdk-coin-btg && \
     yarn link @bitgo/sdk-coin-dash && \
     yarn link @bitgo/sdk-coin-doge && \

modules/abstract-utxo/package.json

@@ -15,7 +15,8 @@
     "lint": "eslint --quiet .",
     "prepare": "npm run build",
     "test": "npm run unit-test",
-    "unit-test": "mocha --recursive test/"
+    "unit-test": "mocha --recursive test/unit/",
+    "integration-test": "mocha --recursive test/integration/"
   },
   "author": "BitGo SDK Team <[email protected]>",
   "license": "MIT",
@@ -47,6 +48,7 @@
     "@bitgo/sdk-core": "^36.15.0",
     "@bitgo/secp256k1": "^1.6.0",
     "@bitgo/unspents": "^0.50.5",
+    "@bitgo/utxo-ord": "^1.22.7",
     "@bitgo/utxo-core": "^1.21.1",
     "@bitgo/utxo-lib": "^11.13.0",
     "@bitgo/wasm-miniscript": "2.0.0-beta.7",
@@ -59,5 +61,9 @@
     "lodash": "^4.17.14",
     "superagent": "^9.0.1"
   },
+  "devDependencies": {
+    "@bitgo/sdk-test": "^9.1.7",
+    "mocha": "^10.2.0"
+  },
   "gitHead": "18e460ddf02de2dbf13c2aa243478188fb539f0c"
 }

modules/sdk-coin-bch/src/bch.ts modules/abstract-utxo/src/impl/bch/bch.tsmodules/sdk-coin-bch/src/bch.ts renamed to modules/abstract-utxo/src/impl/bch/bch.ts

@@ -1,7 +1,8 @@
-import { AbstractUtxoCoin, UtxoNetwork } from '@bitgo/abstract-utxo';
 import { BitGoBase, BaseCoin } from '@bitgo/sdk-core';
 import * as utxolib from '@bitgo/utxo-lib';
 
+import { AbstractUtxoCoin, UtxoNetwork } from '../../abstractUtxoCoin';
+
 export class Bch extends AbstractUtxoCoin {
   protected constructor(bitgo: BitGoBase, network?: UtxoNetwork) {
     super(bitgo, network || utxolib.networks.bitcoincash);

modules/abstract-utxo/src/impl/bch/index.ts

@@ -0,0 +1,2 @@
+export * from './bch';
+export * from './tbch';

modules/sdk-coin-bch/src/tbch.ts …dules/abstract-utxo/src/impl/bch/tbch.tsmodules/sdk-coin-bch/src/tbch.ts renamed to modules/abstract-utxo/src/impl/bch/tbch.ts modules/sdk-coin-bch/src/tbch.ts renamed to modules/abstract-utxo/src/impl/bch/tbch.ts

@@ -2,9 +2,10 @@
  * @prettier
  */
 import { BaseCoin, BitGoBase } from '@bitgo/sdk-core';
-import { Bch } from './bch';
 import * as bitcoin from '@bitgo/utxo-lib';
 
+import { Bch } from './bch';
+
 export class Tbch extends Bch {
   constructor(bitgo: BitGoBase) {
     super(bitgo, bitcoin.networks.bitcoincashTestnet);

modules/sdk-coin-bcha/src/bcha.ts …ules/abstract-utxo/src/impl/bcha/bcha.tsmodules/sdk-coin-bcha/src/bcha.ts renamed to modules/abstract-utxo/src/impl/bcha/bcha.ts modules/sdk-coin-bcha/src/bcha.ts renamed to modules/abstract-utxo/src/impl/bcha/bcha.ts

@@ -1,7 +1,8 @@
 import { BitGoBase, BaseCoin } from '@bitgo/sdk-core';
-import { Bch } from '@bitgo/sdk-coin-bch';
 import * as utxolib from '@bitgo/utxo-lib';
-import { UtxoNetwork } from '@bitgo/abstract-utxo';
+
+import { Bch } from '../bch/bch';
+import { UtxoNetwork } from '../../abstractUtxoCoin';
 
 export class Bcha extends Bch {
   constructor(bitgo: BitGoBase, network?: UtxoNetwork) {

modules/abstract-utxo/src/impl/bcha/index.ts

@@ -0,0 +1,2 @@
+export * from './bcha';
+export * from './tbcha';

modules/sdk-coin-bcha/src/tbcha.ts …les/abstract-utxo/src/impl/bcha/tbcha.tsmodules/sdk-coin-bcha/src/tbcha.ts renamed to modules/abstract-utxo/src/impl/bcha/tbcha.ts modules/sdk-coin-bcha/src/tbcha.ts renamed to modules/abstract-utxo/src/impl/bcha/tbcha.ts

@@ -3,6 +3,7 @@
  */
 import { BitGoBase, BaseCoin } from '@bitgo/sdk-core';
 import * as utxolib from '@bitgo/utxo-lib';
+
 import { Bcha } from './bcha';
 
 export class Tbcha extends Bcha {

modules/sdk-coin-bsv/src/bsv.ts modules/abstract-utxo/src/impl/bsv/bsv.tsmodules/sdk-coin-bsv/src/bsv.ts renamed to modules/abstract-utxo/src/impl/bsv/bsv.ts

@@ -1,8 +1,9 @@
-import { UtxoNetwork } from '@bitgo/abstract-utxo';
-import { Bch } from '@bitgo/sdk-coin-bch';
 import { BitGoBase, BaseCoin } from '@bitgo/sdk-core';
 import * as utxolib from '@bitgo/utxo-lib';
 
+import { UtxoNetwork } from '../../abstractUtxoCoin';
+import { Bch } from '../bch/bch';
+
 export class Bsv extends Bch {
   constructor(bitgo: BitGoBase, network?: UtxoNetwork) {
     super(bitgo, network || utxolib.networks.bitcoinsv);

modules/abstract-utxo/src/impl/bsv/index.ts

@@ -0,0 +1,2 @@
+export * from './bsv';
+export * from './tbsv';