From e42a937ef09d7e3e7077419bdac36c0314fbef15 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Thu, 31 Mar 2022 13:43:02 +0900 Subject: [PATCH] chore(whale): add build support (#1300) * add whale build support * add docker compose Co-authored-by: Eli --- apps/nest-cli.json | 3 +- apps/tsconfig.json | 12 +++++ apps/whale/docker-compose.yml | 48 +++++++++++++++++++ apps/whale/src/{main.ts => index.ts} | 0 .../src/module.api/address.controller.ts | 10 ++-- .../src/module.api/cache/defid.cache.spec.ts | 4 +- .../whale/src/module.api/cache/defid.cache.ts | 6 +-- apps/whale/src/module.api/fee.controller.ts | 2 +- .../module.api/loan.auction.history.e2e.ts | 2 +- apps/whale/src/module.api/loan.controller.ts | 6 +-- .../module.api/loan.vault.controller.e2e.ts | 2 +- .../src/module.api/loan.vault.service.ts | 8 ++-- .../module.api/masternode.controller.e2e.ts | 4 +- .../src/module.api/masternode.controller.ts | 2 +- .../src/module.api/masternode.service.ts | 4 +- .../src/module.api/poolpair.controller.ts | 4 +- apps/whale/src/module.api/poolpair.service.ts | 6 +-- apps/whale/src/module.api/price.controller.ts | 2 +- apps/whale/src/module.api/stats.controller.ts | 6 +-- apps/whale/src/module.api/token.controller.ts | 4 +- .../src/module.indexer/model/dftx.indexer.ts | 2 +- .../model/dftx/create.masternode.spec.ts | 2 +- .../model/dftx/place.auction.bid.ts | 2 +- .../src/module.indexer/rpc.block.provider.ts | 2 +- jest.config.js | 2 +- tsconfig.json | 12 +++++ 26 files changed, 115 insertions(+), 42 deletions(-) create mode 100644 apps/whale/docker-compose.yml rename apps/whale/src/{main.ts => index.ts} (100%) diff --git a/apps/nest-cli.json b/apps/nest-cli.json index b6ff925bbb..477d9b00dd 100644 --- a/apps/nest-cli.json +++ b/apps/nest-cli.json @@ -2,6 +2,7 @@ "collection": "@nestjs/schematics", "monorepo": true, "compilerOptions": { + "webpack": false, "tsConfigPath": "tsconfig.json" }, "projects": { @@ -32,7 +33,7 @@ "whale": { "type": "application", "root": "whale", - "entryFile": "apps/whale/src/main", + "entryFile": "apps/whale/src/index", "sourceRoot": "whale/src" }, "actuator": { diff --git a/apps/tsconfig.json b/apps/tsconfig.json index 3e88b1c588..30b507bb1f 100644 --- a/apps/tsconfig.json +++ b/apps/tsconfig.json @@ -15,6 +15,18 @@ "@defichain-apps/libs/*": [ "libs/*/src" ], + "@defichain/jellyfish-api-core/dist/*": [ + "../packages/jellyfish-api-core/src/*" + ], + "@defichain/whale-api-client/dist/*": [ + "../packages/whale-api-client/src/*" + ], + "@defichain/jellyfish-transaction/dist/*": [ + "../packages/jellyfish-transaction/src/*" + ], + "@defichain/testcontainers/dist/*": [ + "../packages/testcontainers/src/*" + ], "@defichain/*": [ "../packages/*/src" ] diff --git a/apps/whale/docker-compose.yml b/apps/whale/docker-compose.yml new file mode 100644 index 0000000000..00630095a5 --- /dev/null +++ b/apps/whale/docker-compose.yml @@ -0,0 +1,48 @@ +version: '3.7' + +services: + defi-blockchain: + image: defi/defichain:2.6.0 + ports: + - "19554:19554" + command: > + defid + -printtoconsole + -rpcallowip=0.0.0.0/0 + -rpcbind=0.0.0.0 + -rpcuser=whale-rpcuser + -rpcpassword=whale-rpcpassword + -rpcworkqueue=512 + -masternode_operator=mswsMVsyGMj1FzDMbbxw2QW3KvQAv2FKiy + -disablewallet=1 + -regtest=1 + -jellyfish_regtest=1 + -txnotokens=0 + -logtimemicros + -txindex=1 + -acindex=1 + -amkheight=0 + -bayfrontheight=1 + -bayfrontgardensheight=2 + -clarkequayheight=3 + -dakotaheight=4 + -dakotacrescentheight=5 + -eunosheight=6 + -eunospayaheight=7 + -fortcanningheight=8 + -fortcanningmuseumheight=9 + -fortcanninghillheight=10 + + defi-whale: + build: + context: ../.. + args: + APP: whale + ports: + - "3000:3000" + depends_on: + - defi-blockchain + environment: + WHALE_DEFID_URL: http://whale-rpcuser:whale-rpcpassword@defi-blockchain:19554 + WHALE_NETWORK: regtest + WHALE_DATABASE_PROVIDER: memory diff --git a/apps/whale/src/main.ts b/apps/whale/src/index.ts similarity index 100% rename from apps/whale/src/main.ts rename to apps/whale/src/index.ts diff --git a/apps/whale/src/module.api/address.controller.ts b/apps/whale/src/module.api/address.controller.ts index ee4d8b5d08..d3483ef0a2 100644 --- a/apps/whale/src/module.api/address.controller.ts +++ b/apps/whale/src/module.api/address.controller.ts @@ -3,8 +3,8 @@ import { ConflictException, Controller, ForbiddenException, Get, Inject, Param, import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { ApiPagedResponse } from '../module.api/_core/api.paged.response' import { DeFiDCache } from '../module.api/cache/defid.cache' -import { TokenInfo } from '@defichain/jellyfish-api-core/src/category/token' -import { AddressToken, AddressHistory } from '@defichain/whale-api-client/src/api/Address' +import { TokenInfo } from '@defichain/jellyfish-api-core/dist/category/token' +import { AddressToken, AddressHistory } from '@defichain/whale-api-client/dist/api/Address' import { PaginationQuery } from '../module.api/_core/api.query' import { ScriptActivity, ScriptActivityMapper } from '../module.model/script.activity' import { ScriptAggregation, ScriptAggregationMapper } from '../module.model/script.aggregation' @@ -12,11 +12,11 @@ import { ScriptUnspent, ScriptUnspentMapper } from '../module.model/script.unspe import { DeFiAddress } from '@defichain/jellyfish-address' import { NetworkName } from '@defichain/jellyfish-network' import { HexEncoder } from '../module.model/_hex.encoder' -import { toBuffer } from '@defichain/jellyfish-transaction/src/script/_buffer' -import { LoanVaultActive, LoanVaultLiquidated } from '@defichain/whale-api-client/src/api/Loan' +import { toBuffer } from '@defichain/jellyfish-transaction/dist/script/_buffer' +import { LoanVaultActive, LoanVaultLiquidated } from '@defichain/whale-api-client/dist/api/Loan' import { LoanVaultService } from '../module.api/loan.vault.service' import { parseDisplaySymbol } from '../module.api/token.controller' -import { AccountHistory } from '@defichain/jellyfish-api-core/src/category/account' +import { AccountHistory } from '@defichain/jellyfish-api-core/dist/category/account' @Controller('/address/:address') export class AddressController { diff --git a/apps/whale/src/module.api/cache/defid.cache.spec.ts b/apps/whale/src/module.api/cache/defid.cache.spec.ts index be9f31c975..3c0cda0094 100644 --- a/apps/whale/src/module.api/cache/defid.cache.spec.ts +++ b/apps/whale/src/module.api/cache/defid.cache.spec.ts @@ -4,8 +4,8 @@ import { Test, TestingModule } from '@nestjs/testing' import { CACHE_MANAGER, CacheModule } from '@nestjs/common' import { DeFiDCache } from '../../module.api/cache/defid.cache' import { createPoolPair, createToken } from '@defichain/testing' -import { PoolPairInfo } from '@defichain/jellyfish-api-core/src/category/poolpair' -import { TokenInfo } from '@defichain/jellyfish-api-core/src/category/token' +import { PoolPairInfo } from '@defichain/jellyfish-api-core/dist/category/poolpair' +import { TokenInfo } from '@defichain/jellyfish-api-core/dist/category/token' import { Cache } from 'cache-manager' import { CachePrefix } from '../../module.api/cache/global.cache' diff --git a/apps/whale/src/module.api/cache/defid.cache.ts b/apps/whale/src/module.api/cache/defid.cache.ts index e1706b0dcd..77f69b87e8 100644 --- a/apps/whale/src/module.api/cache/defid.cache.ts +++ b/apps/whale/src/module.api/cache/defid.cache.ts @@ -1,10 +1,10 @@ import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common' import { Cache } from 'cache-manager' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' -import { TokenInfo, TokenResult } from '@defichain/jellyfish-api-core/src/category/token' +import { TokenInfo, TokenResult } from '@defichain/jellyfish-api-core/dist/category/token' import { CachePrefix, GlobalCache } from '../../module.api/cache/global.cache' -import { PoolPairInfo } from '@defichain/jellyfish-api-core/src/category/poolpair' -import { GetLoanSchemeResult } from '@defichain/jellyfish-api-core/src/category/loan' +import { PoolPairInfo } from '@defichain/jellyfish-api-core/dist/category/poolpair' +import { GetLoanSchemeResult } from '@defichain/jellyfish-api-core/dist/category/loan' @Injectable() export class DeFiDCache extends GlobalCache { diff --git a/apps/whale/src/module.api/fee.controller.ts b/apps/whale/src/module.api/fee.controller.ts index 9480962f9f..2f9fa80e6b 100644 --- a/apps/whale/src/module.api/fee.controller.ts +++ b/apps/whale/src/module.api/fee.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, ParseIntPipe, Query } from '@nestjs/common' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' -import { EstimateMode } from '@defichain/jellyfish-api-core/src/category/mining' +import { EstimateMode } from '@defichain/jellyfish-api-core/dist/category/mining' @Controller('/fee') export class FeeController { diff --git a/apps/whale/src/module.api/loan.auction.history.e2e.ts b/apps/whale/src/module.api/loan.auction.history.e2e.ts index 8b1a10ed5b..ab7c454659 100644 --- a/apps/whale/src/module.api/loan.auction.history.e2e.ts +++ b/apps/whale/src/module.api/loan.auction.history.e2e.ts @@ -5,7 +5,7 @@ import { LoanController } from '../module.api/loan.controller' import { TestingGroup, Testing } from '@defichain/jellyfish-testing' import { MasterNodeRegTestContainer } from '@defichain/testcontainers' import { RegTestFoundationKeys } from '@defichain/jellyfish-network' -import { VaultLiquidation } from '@defichain/jellyfish-api-core/src/category/loan' +import { VaultLiquidation } from '@defichain/jellyfish-api-core/dist/category/loan' import { HexEncoder } from '../module.model/_hex.encoder' let app: NestFastifyApplication diff --git a/apps/whale/src/module.api/loan.controller.ts b/apps/whale/src/module.api/loan.controller.ts index 7161aec2a8..a0faf4cd00 100644 --- a/apps/whale/src/module.api/loan.controller.ts +++ b/apps/whale/src/module.api/loan.controller.ts @@ -18,20 +18,20 @@ import { GetLoanSchemeResult, LoanSchemeResult, LoanTokenResult -} from '@defichain/jellyfish-api-core/src/category/loan' +} from '@defichain/jellyfish-api-core/dist/category/loan' import { CollateralToken, LoanScheme, LoanToken, LoanVaultActive, LoanVaultLiquidated -} from '@defichain/whale-api-client/src/api/Loan' +} from '@defichain/whale-api-client/dist/api/Loan' import { mapTokenData } from '../module.api/token.controller' import { DeFiDCache } from '../module.api/cache/defid.cache' import { LoanVaultService } from '../module.api/loan.vault.service' import { OraclePriceActiveMapper } from '../module.model/oracle.price.active' import { VaultAuctionHistoryMapper, VaultAuctionBatchHistory } from '../module.model/vault.auction.batch.history' -import { ActivePrice } from '@defichain/whale-api-client/src/api/Prices' +import { ActivePrice } from '@defichain/whale-api-client/dist/api/Prices' import { NetworkName } from '@defichain/jellyfish-network' import { HexEncoder } from '../module.model/_hex.encoder' diff --git a/apps/whale/src/module.api/loan.vault.controller.e2e.ts b/apps/whale/src/module.api/loan.vault.controller.e2e.ts index 2e11a6b108..2b719ffc67 100644 --- a/apps/whale/src/module.api/loan.vault.controller.e2e.ts +++ b/apps/whale/src/module.api/loan.vault.controller.e2e.ts @@ -5,7 +5,7 @@ import { LoanController } from '../module.api/loan.controller' import { NotFoundException } from '@nestjs/common' import { Testing } from '@defichain/jellyfish-testing' import BigNumber from 'bignumber.js' -import { LoanVaultState } from '@defichain/whale-api-client/src/api/Loan' +import { LoanVaultState } from '@defichain/whale-api-client/dist/api/Loan' const container = new LoanMasterNodeRegTestContainer() let app: NestFastifyApplication diff --git a/apps/whale/src/module.api/loan.vault.service.ts b/apps/whale/src/module.api/loan.vault.service.ts index b076e5029b..bdd04ae32f 100644 --- a/apps/whale/src/module.api/loan.vault.service.ts +++ b/apps/whale/src/module.api/loan.vault.service.ts @@ -5,7 +5,7 @@ import { VaultLiquidation, VaultPagination, VaultState -} from '@defichain/jellyfish-api-core/src/category/loan' +} from '@defichain/jellyfish-api-core/dist/category/loan' import { ApiPagedResponse } from '../module.api/_core/api.paged.response' import { LoanScheme, @@ -14,13 +14,13 @@ import { LoanVaultLiquidationBatch, LoanVaultState, LoanVaultTokenAmount -} from '@defichain/whale-api-client/src/api/Loan' +} from '@defichain/whale-api-client/dist/api/Loan' import { Inject, BadRequestException, ConflictException, Injectable, NotFoundException } from '@nestjs/common' -import { TokenInfo } from '@defichain/jellyfish-api-core/src/category/token' +import { TokenInfo } from '@defichain/jellyfish-api-core/dist/category/token' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { DeFiDCache } from '../module.api/cache/defid.cache' import { parseDisplaySymbol } from '../module.api/token.controller' -import { ActivePrice } from '@defichain/whale-api-client/src/api/Prices' +import { ActivePrice } from '@defichain/whale-api-client/dist/api/Prices' import { OraclePriceActiveMapper } from '../module.model/oracle.price.active' import { RpcApiError } from '@defichain/jellyfish-api-core' import { fromScriptHex } from '@defichain/jellyfish-address' diff --git a/apps/whale/src/module.api/masternode.controller.e2e.ts b/apps/whale/src/module.api/masternode.controller.e2e.ts index 2cd14cda76..ec4f3cfc22 100644 --- a/apps/whale/src/module.api/masternode.controller.e2e.ts +++ b/apps/whale/src/module.api/masternode.controller.e2e.ts @@ -4,8 +4,8 @@ import { createTestingApp, DelayedEunosPayaTestContainer, stopTestingApp, waitFo import { NotFoundException } from '@nestjs/common' import { MasternodeController } from '../module.api/masternode.controller' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' -import { MasternodeState } from '@defichain/whale-api-client/src/api/MasterNodes' -import { MasternodeTimeLock } from '@defichain/jellyfish-api-core/src/category/masternode' +import { MasternodeState } from '@defichain/whale-api-client/dist/api/MasterNodes' +import { MasternodeTimeLock } from '@defichain/jellyfish-api-core/dist/category/masternode' describe('list', () => { const container = new MasterNodeRegTestContainer() diff --git a/apps/whale/src/module.api/masternode.controller.ts b/apps/whale/src/module.api/masternode.controller.ts index 05c50b513c..4e72078ac5 100644 --- a/apps/whale/src/module.api/masternode.controller.ts +++ b/apps/whale/src/module.api/masternode.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get, NotFoundException, Param, Query } from '@nestjs/common' import { ApiPagedResponse } from '../module.api/_core/api.paged.response' import { PaginationQuery } from '../module.api/_core/api.query' -import { MasternodeData } from '@defichain/whale-api-client/src/api/MasterNodes' +import { MasternodeData } from '@defichain/whale-api-client/dist/api/MasterNodes' import { Masternode, MasternodeMapper } from '../module.model/masternode' import { BlockMapper } from '../module.model/block' import { MasternodeService } from './masternode.service' diff --git a/apps/whale/src/module.api/masternode.service.ts b/apps/whale/src/module.api/masternode.service.ts index 85de927ea7..90510b59cb 100644 --- a/apps/whale/src/module.api/masternode.service.ts +++ b/apps/whale/src/module.api/masternode.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { SemaphoreCache } from '../module.api/cache/semaphore.cache' import { Masternode } from '../module.model/masternode' -import { MasternodeState } from '@defichain/jellyfish-api-core/src/category/masternode' +import { MasternodeState } from '@defichain/jellyfish-api-core/dist/category/masternode' import { NetworkName } from '@defichain/jellyfish-network' const MasternodeConsensusParams = { @@ -61,7 +61,7 @@ export class MasternodeService { } // !TODO: Alter retrospective behaviour based on EunosPaya height - // See: https://github.com/DeFiCh/ain/blob/master/src/masternodes/masternodes.cpp#L116 + // See: https://github.com/DeFiCh/ain/blob/master/dist/masternodes/masternodes.cpp#L116 async getMasternodeState (masternode: Masternode, height: number): Promise { if (masternode.resignHeight === -1) { // enabled or pre-enabled // Special case for genesis block diff --git a/apps/whale/src/module.api/poolpair.controller.ts b/apps/whale/src/module.api/poolpair.controller.ts index 4781643cfa..034e255dce 100644 --- a/apps/whale/src/module.api/poolpair.controller.ts +++ b/apps/whale/src/module.api/poolpair.controller.ts @@ -9,11 +9,11 @@ import { PoolSwapAggregatedData, PoolSwapData, SwapPathsResult -} from '@defichain/whale-api-client/src/api/PoolPairs' +} from '@defichain/whale-api-client/dist/api/PoolPairs' import { PaginationQuery } from '../module.api/_core/api.query' import { PoolPairService, PoolSwapPathFindingService } from './poolpair.service' import BigNumber from 'bignumber.js' -import { PoolPairInfo } from '@defichain/jellyfish-api-core/src/category/poolpair' +import { PoolPairInfo } from '@defichain/jellyfish-api-core/dist/category/poolpair' import { parseDATSymbol } from '../module.api/token.controller' import { PoolSwapMapper } from '../module.model/pool.swap' import { PoolSwapAggregatedMapper } from '../module.model/pool.swap.aggregated' diff --git a/apps/whale/src/module.api/poolpair.service.ts b/apps/whale/src/module.api/poolpair.service.ts index b4d4716fee..53d973a80b 100644 --- a/apps/whale/src/module.api/poolpair.service.ts +++ b/apps/whale/src/module.api/poolpair.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable, NotFoundException } from '@nestjs/common' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import BigNumber from 'bignumber.js' -import { PoolPairInfo } from '@defichain/jellyfish-api-core/src/category/poolpair' +import { PoolPairInfo } from '@defichain/jellyfish-api-core/dist/category/poolpair' import { SemaphoreCache } from '../module.api/cache/semaphore.cache' import { AllSwappableTokensResult, @@ -11,7 +11,7 @@ import { PoolSwapFromToData, SwapPathPoolPair, SwapPathsResult, SwapType, TokenIdentifier -} from '@defichain/whale-api-client/src/api/PoolPairs' +} from '@defichain/whale-api-client/dist/api/PoolPairs' import { getBlockSubsidy } from '../module.api/subsidy' import { BlockMapper } from '../module.model/block' import { TokenMapper } from '../module.model/token' @@ -30,7 +30,7 @@ import { } from '@defichain/jellyfish-transaction' import { fromScript } from '@defichain/jellyfish-address' import { NetworkName } from '@defichain/jellyfish-network' -import { AccountHistory } from '@defichain/jellyfish-api-core/src/category/account' +import { AccountHistory } from '@defichain/jellyfish-api-core/dist/category/account' import { DeFiDCache } from '../module.api/cache/defid.cache' import { parseDisplaySymbol } from '../module.api/token.controller' import { UndirectedGraph } from 'graphology' diff --git a/apps/whale/src/module.api/price.controller.ts b/apps/whale/src/module.api/price.controller.ts index f95b33faf3..d9d107130a 100644 --- a/apps/whale/src/module.api/price.controller.ts +++ b/apps/whale/src/module.api/price.controller.ts @@ -5,7 +5,7 @@ import { OraclePriceAggregatedIntervalMapper } from '../module.model/oracle.pric import { ApiPagedResponse } from '../module.api/_core/api.paged.response' import { PaginationQuery } from '../module.api/_core/api.query' import { PriceTicker, PriceTickerMapper } from '../module.model/price.ticker' -import { PriceFeedInterval, PriceOracle } from '@defichain/whale-api-client/src/api/Prices' +import { PriceFeedInterval, PriceOracle } from '@defichain/whale-api-client/dist/api/Prices' import { OraclePriceFeedMapper } from '../module.model/oracle.price.feed' import { OraclePriceActive, OraclePriceActiveMapper } from '../module.model/oracle.price.active' diff --git a/apps/whale/src/module.api/stats.controller.ts b/apps/whale/src/module.api/stats.controller.ts index db4bb86f04..8280ba75af 100644 --- a/apps/whale/src/module.api/stats.controller.ts +++ b/apps/whale/src/module.api/stats.controller.ts @@ -1,5 +1,5 @@ import { Controller, Get } from '@nestjs/common' -import { StatsData, SupplyData } from '@defichain/whale-api-client/src/api/Stats' +import { StatsData, SupplyData } from '@defichain/whale-api-client/dist/api/Stats' import { SemaphoreCache } from '../module.api/cache/semaphore.cache' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { BlockMapper } from '../module.model/block' @@ -7,10 +7,10 @@ import { PoolPairService } from '../module.api/poolpair.service' import BigNumber from 'bignumber.js' import { PriceTickerMapper } from '../module.model/price.ticker' import { MasternodeStats, MasternodeStatsMapper } from '../module.model/masternode.stats' -import { BlockchainInfo } from '@defichain/jellyfish-api-core/src/category/blockchain' +import { BlockchainInfo } from '@defichain/jellyfish-api-core/dist/category/blockchain' import { getBlockSubsidy } from '../module.api/subsidy' import { BlockSubsidy } from '@defichain/jellyfish-network' -import { BurnInfo } from '@defichain/jellyfish-api-core/src/category/account' +import { BurnInfo } from '@defichain/jellyfish-api-core/dist/category/account' @Controller('/stats') export class StatsController { diff --git a/apps/whale/src/module.api/token.controller.ts b/apps/whale/src/module.api/token.controller.ts index b572c71376..682d6deaeb 100644 --- a/apps/whale/src/module.api/token.controller.ts +++ b/apps/whale/src/module.api/token.controller.ts @@ -1,9 +1,9 @@ import { Controller, Get, NotFoundException, Param, ParseIntPipe, Query } from '@nestjs/common' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { ApiPagedResponse } from '../module.api/_core/api.paged.response' -import { TokenInfo } from '@defichain/jellyfish-api-core/src/category/token' +import { TokenInfo } from '@defichain/jellyfish-api-core/dist/category/token' import { PaginationQuery } from '../module.api/_core/api.query' -import { TokenData } from '@defichain/whale-api-client/src/api/Tokens' +import { TokenData } from '@defichain/whale-api-client/dist/api/Tokens' import { DeFiDCache } from '../module.api/cache/defid.cache' @Controller('/tokens') diff --git a/apps/whale/src/module.indexer/model/dftx.indexer.ts b/apps/whale/src/module.indexer/model/dftx.indexer.ts index f8494cf65d..99c1da1c38 100644 --- a/apps/whale/src/module.indexer/model/dftx.indexer.ts +++ b/apps/whale/src/module.indexer/model/dftx.indexer.ts @@ -1,6 +1,6 @@ import { OP_DEFI_TX, OPCode } from '@defichain/jellyfish-transaction' import { Indexer, RawBlock } from '../../module.indexer/model/_abstract' -import { toOPCodes } from '@defichain/jellyfish-transaction/src/script/_buffer' +import { toOPCodes } from '@defichain/jellyfish-transaction/dist/script/_buffer' import { SmartBuffer } from 'smart-buffer' import { AppointOracleIndexer } from '../../module.indexer/model/dftx/appoint.oracle' import { RemoveOracleIndexer } from '../../module.indexer/model/dftx/remove.oracle' diff --git a/apps/whale/src/module.indexer/model/dftx/create.masternode.spec.ts b/apps/whale/src/module.indexer/model/dftx/create.masternode.spec.ts index 108b03e8d8..f982334db2 100644 --- a/apps/whale/src/module.indexer/model/dftx/create.masternode.spec.ts +++ b/apps/whale/src/module.indexer/model/dftx/create.masternode.spec.ts @@ -8,7 +8,7 @@ import { import { NestFastifyApplication } from '@nestjs/platform-fastify' import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc' import { MasternodeMapper } from '../../../module.model/masternode' -import { MasternodeInfo } from '@defichain/jellyfish-api-core/src/category/masternode' +import { MasternodeInfo } from '@defichain/jellyfish-api-core/dist/category/masternode' import { MasterNodeRegTestContainer } from '@defichain/testcontainers' import { MasternodeStatsMapper } from '../../../module.model/masternode.stats' diff --git a/apps/whale/src/module.indexer/model/dftx/place.auction.bid.ts b/apps/whale/src/module.indexer/model/dftx/place.auction.bid.ts index ced5ddb1ab..543a0cf0b4 100644 --- a/apps/whale/src/module.indexer/model/dftx/place.auction.bid.ts +++ b/apps/whale/src/module.indexer/model/dftx/place.auction.bid.ts @@ -3,7 +3,7 @@ import { PlaceAuctionBid, CPlaceAuctionBid } from '@defichain/jellyfish-transact import { RawBlock } from '../../../module.indexer/model/_abstract' import { Injectable, Logger } from '@nestjs/common' import { VaultAuctionHistoryMapper } from '../../../module.model/vault.auction.batch.history' -import { toBuffer } from '@defichain/jellyfish-transaction/src/script/_buffer' +import { toBuffer } from '@defichain/jellyfish-transaction/dist/script/_buffer' import { HexEncoder } from '../../../module.model/_hex.encoder' @Injectable() diff --git a/apps/whale/src/module.indexer/rpc.block.provider.ts b/apps/whale/src/module.indexer/rpc.block.provider.ts index ff1ff4df90..0825d32f5f 100644 --- a/apps/whale/src/module.indexer/rpc.block.provider.ts +++ b/apps/whale/src/module.indexer/rpc.block.provider.ts @@ -6,7 +6,7 @@ import { Block, BlockMapper } from '../module.model/block' import { IndexStatusMapper, Status } from '../module.indexer/status' import { TokenMapper } from '../module.model/token' import { HexEncoder } from '../module.model/_hex.encoder' -import { waitForCondition } from '@defichain/testcontainers/src/utils' +import { waitForCondition } from '@defichain/testcontainers/dist/utils' import { blockchain as defid, RpcApiError } from '@defichain/jellyfish-api-core' @Injectable() diff --git a/jest.config.js b/jest.config.js index 6e76938808..fd4b9c6c20 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,7 +3,7 @@ module.exports = { testRegex: '((\\.|/)(e2e|test|spec))\\.[jt]sx?$', testSequencer: require.resolve('./jest.sequencer'), moduleNameMapper: { - '@defichain/(.*)/src/(.*)': '/packages/$1/src/$2', + '@defichain/(.*)/dist/(.*)': '/packages/$1/src/$2', '@defichain/(.*)': '/packages/$1/src', // apps diff --git a/tsconfig.json b/tsconfig.json index 8a6e1800fb..0b061b3ebf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,18 @@ "@defichain-apps/libs/*": [ "apps/libs/*/src" ], + "@defichain/jellyfish-api-core/dist/*": [ + "packages/jellyfish-api-core/src/*" + ], + "@defichain/whale-api-client/dist/*": [ + "packages/whale-api-client/src/*" + ], + "@defichain/jellyfish-transaction/dist/*": [ + "packages/jellyfish-transaction/src/*" + ], + "@defichain/testcontainers/dist/*": [ + "packages/testcontainers/src/*" + ], "@defichain/*": [ "packages/*/src" ]