diff --git a/apps/api/package.json b/apps/api/package.json index dd4abc410..ac1296cf3 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/cloudmos-shared": "*", + "@akashnetwork/database": "*", "@chain-registry/assets": "^0.7.1", "@cosmjs/crypto": "^0.28.11", "@cosmjs/encoding": "^0.28.11", diff --git a/apps/api/src/db/dbConnection.ts b/apps/api/src/db/dbConnection.ts index f68949e74..92a7f3b2a 100644 --- a/apps/api/src/db/dbConnection.ts +++ b/apps/api/src/db/dbConnection.ts @@ -1,6 +1,6 @@ -import { chainDefinitions } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { chainModels, getChainModels, userModels } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Template, TemplateFavorite, UserAddressName, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user"; +import { chainDefinitions } from "@akashnetwork/database/chainDefinitions"; +import { chainModels, getChainModels, userModels } from "@akashnetwork/database/dbSchemas"; +import { Template, TemplateFavorite, UserAddressName, UserSetting } from "@akashnetwork/database/dbSchemas/user"; import pg from "pg"; import { Transaction as DbTransaction } from "sequelize"; import { Sequelize } from "sequelize-typescript"; diff --git a/apps/api/src/routers/dashboardRouter.ts b/apps/api/src/routers/dashboardRouter.ts index ab7d2290b..c3fb81d39 100644 --- a/apps/api/src/routers/dashboardRouter.ts +++ b/apps/api/src/routers/dashboardRouter.ts @@ -1,4 +1,4 @@ -import { Template, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user"; +import { Template, UserSetting } from "@akashnetwork/database/dbSchemas/user"; import { Hono } from "hono"; import { privateMiddleware } from "@src/middlewares/privateMiddleware"; diff --git a/apps/api/src/routes/internal/gpuPrices.ts b/apps/api/src/routes/internal/gpuPrices.ts index 0cd17dec5..74eb8eb6b 100644 --- a/apps/api/src/routes/internal/gpuPrices.ts +++ b/apps/api/src/routes/internal/gpuPrices.ts @@ -1,7 +1,7 @@ import { MsgCreateBid } from "@akashnetwork/akash-api/akash/market/v1beta4"; -import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { AkashMessage, Deployment, DeploymentGroup, DeploymentGroupResource } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Day, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { Block } from "@akashnetwork/database/dbSchemas"; +import { AkashMessage, Deployment, DeploymentGroup, DeploymentGroupResource } from "@akashnetwork/database/dbSchemas/akash"; +import { Day, Transaction } from "@akashnetwork/database/dbSchemas/base"; import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi"; import { addDays, sub } from "date-fns"; import { Op, QueryTypes } from "sequelize"; diff --git a/apps/api/src/routes/internal/leasesDuration.ts b/apps/api/src/routes/internal/leasesDuration.ts index bb0af8076..a3e433de6 100644 --- a/apps/api/src/routes/internal/leasesDuration.ts +++ b/apps/api/src/routes/internal/leasesDuration.ts @@ -1,5 +1,5 @@ -import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Lease } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Block } from "@akashnetwork/database/dbSchemas"; +import { Lease } from "@akashnetwork/database/dbSchemas/akash"; import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi"; import { differenceInSeconds } from "date-fns"; import { Op } from "sequelize"; diff --git a/apps/api/src/services/db/blocksService.ts b/apps/api/src/services/db/blocksService.ts index db7b9ede1..912f5f4ef 100644 --- a/apps/api/src/services/db/blocksService.ts +++ b/apps/api/src/services/db/blocksService.ts @@ -1,5 +1,5 @@ -import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Transaction, Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/database/dbSchemas/akash"; +import { Transaction, Validator } from "@akashnetwork/database/dbSchemas/base"; import { addSeconds, differenceInSeconds } from "date-fns"; export async function getBlocks(limit: number) { diff --git a/apps/api/src/services/db/deploymentService.ts b/apps/api/src/services/db/deploymentService.ts index 57d79cbac..d2964b6a0 100644 --- a/apps/api/src/services/db/deploymentService.ts +++ b/apps/api/src/services/db/deploymentService.ts @@ -1,8 +1,8 @@ import * as v2beta2 from "@akashnetwork/akash-api/akash/market/v1beta2"; import * as v1beta1 from "@akashnetwork/akash-api/deprecated/akash/market/v1beta1"; -import { Block, Message } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Deployment, Lease } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { Block, Message } from "@akashnetwork/database/dbSchemas"; +import { Deployment, Lease } from "@akashnetwork/database/dbSchemas/akash"; +import { Transaction } from "@akashnetwork/database/dbSchemas/base"; import { Op, WhereOptions } from "sequelize"; import { decodeMsg } from "@src/utils/protobuf"; diff --git a/apps/api/src/services/db/networkRevenueService.ts b/apps/api/src/services/db/networkRevenueService.ts index a4df9069a..bb40d6304 100644 --- a/apps/api/src/services/db/networkRevenueService.ts +++ b/apps/api/src/services/db/networkRevenueService.ts @@ -1,5 +1,5 @@ -import { AkashBlock as Block } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { AkashBlock as Block } from "@akashnetwork/database/dbSchemas/akash"; +import { Day } from "@akashnetwork/database/dbSchemas/base"; import { add } from "date-fns"; import { Op } from "sequelize"; diff --git a/apps/api/src/services/db/providerDataService.ts b/apps/api/src/services/db/providerDataService.ts index ad509f6b2..eb5a8d720 100644 --- a/apps/api/src/services/db/providerDataService.ts +++ b/apps/api/src/services/db/providerDataService.ts @@ -1,4 +1,4 @@ -import { Provider, ProviderAttribute } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider, ProviderAttribute } from "@akashnetwork/database/dbSchemas/akash"; import { getProviderAttributesSchema } from "@src/services/external/githubService"; diff --git a/apps/api/src/services/db/providerStatusService.ts b/apps/api/src/services/db/providerStatusService.ts index 27d6799fb..8475229b5 100644 --- a/apps/api/src/services/db/providerStatusService.ts +++ b/apps/api/src/services/db/providerStatusService.ts @@ -4,8 +4,8 @@ import { ProviderAttributeSignature, ProviderSnapshotNode, ProviderSnapshotNodeGPU -} from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { ProviderSnapshot } from "@akashnetwork/cloudmos-shared/dbSchemas/akash/providerSnapshot"; +} from "@akashnetwork/database/dbSchemas/akash"; +import { ProviderSnapshot } from "@akashnetwork/database/dbSchemas/akash/providerSnapshot"; import { add, sub } from "date-fns"; import { Op } from "sequelize"; diff --git a/apps/api/src/services/db/statsService.ts b/apps/api/src/services/db/statsService.ts index b6aaad40b..9f868f629 100644 --- a/apps/api/src/services/db/statsService.ts +++ b/apps/api/src/services/db/statsService.ts @@ -1,5 +1,5 @@ -import { AkashBlock as Block } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { AkashBlock as Block } from "@akashnetwork/database/dbSchemas/akash"; +import { Day } from "@akashnetwork/database/dbSchemas/base"; import { subHours } from "date-fns"; import { Op, QueryTypes } from "sequelize"; diff --git a/apps/api/src/services/db/templateService.ts b/apps/api/src/services/db/templateService.ts index 9a919b489..187630172 100644 --- a/apps/api/src/services/db/templateService.ts +++ b/apps/api/src/services/db/templateService.ts @@ -1,4 +1,4 @@ -import { Template, TemplateFavorite, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user"; +import { Template, TemplateFavorite, UserSetting } from "@akashnetwork/database/dbSchemas/user"; import { Op } from "sequelize"; import * as uuid from "uuid"; diff --git a/apps/api/src/services/db/transactionsService.ts b/apps/api/src/services/db/transactionsService.ts index e8958a4bb..30a64070e 100644 --- a/apps/api/src/services/db/transactionsService.ts +++ b/apps/api/src/services/db/transactionsService.ts @@ -1,5 +1,5 @@ -import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { AddressReference, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/database/dbSchemas/akash"; +import { AddressReference, Transaction } from "@akashnetwork/database/dbSchemas/base"; import { QueryTypes } from "sequelize"; import { chainDb } from "@src/db/dbConnection"; diff --git a/apps/api/src/services/db/userDataService.ts b/apps/api/src/services/db/userDataService.ts index 31c5234e4..acf56d359 100644 --- a/apps/api/src/services/db/userDataService.ts +++ b/apps/api/src/services/db/userDataService.ts @@ -1,4 +1,4 @@ -import { UserAddressName, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user"; +import { UserAddressName, UserSetting } from "@akashnetwork/database/dbSchemas/user"; import { Transaction } from "sequelize"; import { getUserPlan } from "../external/stripeService"; diff --git a/apps/api/src/services/external/apiNodeService.ts b/apps/api/src/services/external/apiNodeService.ts index 7d6bc9a21..2b43adc51 100644 --- a/apps/api/src/services/external/apiNodeService.ts +++ b/apps/api/src/services/external/apiNodeService.ts @@ -1,6 +1,6 @@ -import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Deployment, Lease, Provider, ProviderAttribute } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { Block } from "@akashnetwork/database/dbSchemas"; +import { Deployment, Lease, Provider, ProviderAttribute } from "@akashnetwork/database/dbSchemas/akash"; +import { Validator } from "@akashnetwork/database/dbSchemas/base"; import axios from "axios"; import fetch from "node-fetch"; import { Op } from "sequelize"; diff --git a/apps/api/src/services/external/stripeService.ts b/apps/api/src/services/external/stripeService.ts index 2b3014730..5cc55ff4d 100644 --- a/apps/api/src/services/external/stripeService.ts +++ b/apps/api/src/services/external/stripeService.ts @@ -1,5 +1,5 @@ -import { UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user"; -import { PlanCode } from "@akashnetwork/cloudmos-shared/plans"; +import { UserSetting } from "@akashnetwork/database/dbSchemas/user"; +import { PlanCode } from "@akashnetwork/database/plans"; import Stripe from "stripe"; import { env } from "@src/utils/env"; diff --git a/apps/api/src/utils/map/provider.ts b/apps/api/src/utils/map/provider.ts index 7019bd386..af02d9930 100644 --- a/apps/api/src/utils/map/provider.ts +++ b/apps/api/src/utils/map/provider.ts @@ -1,4 +1,4 @@ -import { Provider, ProviderSnapshot, ProviderSnapshotNode } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider, ProviderSnapshot, ProviderSnapshotNode } from "@akashnetwork/database/dbSchemas/akash"; import semver from "semver"; import { Auditor, ProviderAttributesSchema, ProviderList } from "@src/types/provider"; diff --git a/apps/indexer/package.json b/apps/indexer/package.json index e4862c858..bf2ba9157 100644 --- a/apps/indexer/package.json +++ b/apps/indexer/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/cloudmos-shared": "*", + "@akashnetwork/database": "*", "@cosmjs/crypto": "^0.31.1", "@cosmjs/encoding": "^0.32.3", "@cosmjs/math": "^0.31.1", diff --git a/apps/indexer/src/chain/chainSync.ts b/apps/indexer/src/chain/chainSync.ts index 0803aa9f4..34be463d2 100644 --- a/apps/indexer/src/chain/chainSync.ts +++ b/apps/indexer/src/chain/chainSync.ts @@ -1,6 +1,6 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { Block, Message } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Day, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { Block, Message } from "@akashnetwork/database/dbSchemas"; +import { Day, Transaction } from "@akashnetwork/database/dbSchemas/base"; import { fromBase64 } from "@cosmjs/encoding"; import { decodeTxRaw } from "@cosmjs/proto-signing"; import { asyncify, eachLimit } from "async"; diff --git a/apps/indexer/src/chain/genesisImporter.ts b/apps/indexer/src/chain/genesisImporter.ts index f3ea43141..5317595bc 100644 --- a/apps/indexer/src/chain/genesisImporter.ts +++ b/apps/indexer/src/chain/genesisImporter.ts @@ -1,4 +1,4 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; import fs from "fs"; import { ungzip } from "node-gzip"; import path from "path"; diff --git a/apps/indexer/src/chain/nodeAccessor.ts b/apps/indexer/src/chain/nodeAccessor.ts index 2e78a8843..b56fc0fab 100644 --- a/apps/indexer/src/chain/nodeAccessor.ts +++ b/apps/indexer/src/chain/nodeAccessor.ts @@ -1,4 +1,4 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; import fs from "fs"; import { concurrentNodeQuery, dataFolderPath } from "@src/shared/constants"; diff --git a/apps/indexer/src/chain/statsProcessor.ts b/apps/indexer/src/chain/statsProcessor.ts index a607abf6b..25f30b0c2 100644 --- a/apps/indexer/src/chain/statsProcessor.ts +++ b/apps/indexer/src/chain/statsProcessor.ts @@ -1,7 +1,7 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { Block, Message } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { AkashMessage } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { Block, Message } from "@akashnetwork/database/dbSchemas"; +import { AkashMessage } from "@akashnetwork/database/dbSchemas/akash"; +import { Transaction } from "@akashnetwork/database/dbSchemas/base"; import { fromBase64 } from "@cosmjs/encoding"; import { decodeTxRaw } from "@cosmjs/proto-signing"; import { sha256 } from "js-sha256"; diff --git a/apps/indexer/src/db/buildDatabase.ts b/apps/indexer/src/db/buildDatabase.ts index bd6ebf73e..fc252d7f9 100644 --- a/apps/indexer/src/db/buildDatabase.ts +++ b/apps/indexer/src/db/buildDatabase.ts @@ -1,7 +1,7 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { Block, Message } from "@akashnetwork/cloudmos-shared/dbSchemas"; -import { Day, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; -import { MonitoredValue } from "@akashnetwork/cloudmos-shared/dbSchemas/base/monitoredValue"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { Block, Message } from "@akashnetwork/database/dbSchemas"; +import { Day, Transaction } from "@akashnetwork/database/dbSchemas/base"; +import { MonitoredValue } from "@akashnetwork/database/dbSchemas/base/monitoredValue"; import { getGenesis } from "@src/chain/genesisImporter"; import { indexers } from "@src/indexers"; diff --git a/apps/indexer/src/db/dbConnection.ts b/apps/indexer/src/db/dbConnection.ts index 3031cca6e..72ea17e08 100644 --- a/apps/indexer/src/db/dbConnection.ts +++ b/apps/indexer/src/db/dbConnection.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { chainModels } from "@akashnetwork/cloudmos-shared/dbSchemas"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { chainModels } from "@akashnetwork/database/dbSchemas"; import pg from "pg"; import { Transaction as DbTransaction } from "sequelize"; import { Sequelize } from "sequelize-typescript"; diff --git a/apps/indexer/src/db/keybaseProvider.ts b/apps/indexer/src/db/keybaseProvider.ts index c1f36190d..4d74e7963 100644 --- a/apps/indexer/src/db/keybaseProvider.ts +++ b/apps/indexer/src/db/keybaseProvider.ts @@ -1,4 +1,4 @@ -import { Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { Validator } from "@akashnetwork/database/dbSchemas/base"; import fetch from "node-fetch"; import { Op } from "sequelize"; diff --git a/apps/indexer/src/db/priceHistoryProvider.ts b/apps/indexer/src/db/priceHistoryProvider.ts index 71c15d7af..8ae5422e7 100644 --- a/apps/indexer/src/db/priceHistoryProvider.ts +++ b/apps/indexer/src/db/priceHistoryProvider.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { Day } from "@akashnetwork/database/dbSchemas/base"; import { isSameDay } from "date-fns"; import fetch from "node-fetch"; diff --git a/apps/indexer/src/index.ts b/apps/indexer/src/index.ts index 02eccd43a..878e10f29 100644 --- a/apps/indexer/src/index.ts +++ b/apps/indexer/src/index.ts @@ -1,4 +1,4 @@ -import { activeChain, chainDefinitions } from "@akashnetwork/cloudmos-shared/chainDefinitions"; +import { activeChain, chainDefinitions } from "@akashnetwork/database/chainDefinitions"; import * as Sentry from "@sentry/node"; import express from "express"; diff --git a/apps/indexer/src/indexers/akashStatsIndexer.ts b/apps/indexer/src/indexers/akashStatsIndexer.ts index fcd80bf31..697f3f52c 100644 --- a/apps/indexer/src/indexers/akashStatsIndexer.ts +++ b/apps/indexer/src/indexers/akashStatsIndexer.ts @@ -15,8 +15,8 @@ import { ProviderSnapshotNode, ProviderSnapshotNodeCPU, ProviderSnapshotNodeGPU -} from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +} from "@akashnetwork/database/dbSchemas/akash"; +import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/database/dbSchemas/akash"; import { Op, Transaction as DbTransaction } from "sequelize"; import * as uuid from "uuid"; diff --git a/apps/indexer/src/indexers/index.ts b/apps/indexer/src/indexers/index.ts index 22a2bf2dd..0b841b944 100644 --- a/apps/indexer/src/indexers/index.ts +++ b/apps/indexer/src/indexers/index.ts @@ -1,4 +1,4 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; import { AkashStatsIndexer } from "./akashStatsIndexer"; import { Indexer } from "./indexer"; diff --git a/apps/indexer/src/indexers/indexer.ts b/apps/indexer/src/indexers/indexer.ts index b9e4ee183..9219bc2b3 100644 --- a/apps/indexer/src/indexers/indexer.ts +++ b/apps/indexer/src/indexers/indexer.ts @@ -1,4 +1,4 @@ -import { Block, Message, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { Block, Message, Transaction } from "@akashnetwork/database/dbSchemas/base"; import { DecodedTxRaw } from "@cosmjs/proto-signing"; import { Transaction as DbTransaction } from "sequelize"; diff --git a/apps/indexer/src/indexers/messageAddressesIndexer.ts b/apps/indexer/src/indexers/messageAddressesIndexer.ts index 51f3c4beb..01be8ab37 100644 --- a/apps/indexer/src/indexers/messageAddressesIndexer.ts +++ b/apps/indexer/src/indexers/messageAddressesIndexer.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { AddressReference, Message, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { AddressReference, Message, Transaction } from "@akashnetwork/database/dbSchemas/base"; import { toBech32 } from "@cosmjs/encoding"; import { DecodedTxRaw, decodePubkey } from "@cosmjs/proto-signing"; import { MsgMultiSend, MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx"; diff --git a/apps/indexer/src/indexers/validatorIndexer.ts b/apps/indexer/src/indexers/validatorIndexer.ts index 79fe236df..6537169da 100644 --- a/apps/indexer/src/indexers/validatorIndexer.ts +++ b/apps/indexer/src/indexers/validatorIndexer.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { Message, Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { Message, Validator } from "@akashnetwork/database/dbSchemas/base"; import { fromBase64, fromBech32, toBech32, toHex } from "@cosmjs/encoding"; import { MsgCreateValidator, MsgEditValidator } from "cosmjs-types/cosmos/staking/v1beta1/tx"; import { Transaction as DbTransaction } from "sequelize"; diff --git a/apps/indexer/src/monitors/addressBalanceMonitor.ts b/apps/indexer/src/monitors/addressBalanceMonitor.ts index 864f1a406..0fad2b937 100644 --- a/apps/indexer/src/monitors/addressBalanceMonitor.ts +++ b/apps/indexer/src/monitors/addressBalanceMonitor.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { MonitoredValue } from "@akashnetwork/cloudmos-shared/dbSchemas/base/monitoredValue"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { MonitoredValue } from "@akashnetwork/database/dbSchemas/base/monitoredValue"; import axios from "axios"; export class AddressBalanceMonitor { diff --git a/apps/indexer/src/monitors/deploymentBalanceMonitor.ts b/apps/indexer/src/monitors/deploymentBalanceMonitor.ts index 1177ab8dc..95bde473f 100644 --- a/apps/indexer/src/monitors/deploymentBalanceMonitor.ts +++ b/apps/indexer/src/monitors/deploymentBalanceMonitor.ts @@ -1,5 +1,5 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; -import { MonitoredValue } from "@akashnetwork/cloudmos-shared/dbSchemas/base/monitoredValue"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; +import { MonitoredValue } from "@akashnetwork/database/dbSchemas/base/monitoredValue"; import * as Sentry from "@sentry/node"; import axios from "axios"; diff --git a/apps/indexer/src/providers/ipLocationProvider.ts b/apps/indexer/src/providers/ipLocationProvider.ts index a71332e52..f353f6777 100644 --- a/apps/indexer/src/providers/ipLocationProvider.ts +++ b/apps/indexer/src/providers/ipLocationProvider.ts @@ -1,4 +1,4 @@ -import { Provider } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider } from "@akashnetwork/database/dbSchemas/akash"; import axios from "axios"; import dns from "dns/promises"; diff --git a/apps/indexer/src/providers/providerStatusProvider.ts b/apps/indexer/src/providers/providerStatusProvider.ts index 6ce680ba7..42cfb2219 100644 --- a/apps/indexer/src/providers/providerStatusProvider.ts +++ b/apps/indexer/src/providers/providerStatusProvider.ts @@ -4,7 +4,7 @@ import { ProviderSnapshotNode, ProviderSnapshotNodeCPU, ProviderSnapshotNodeGPU -} from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +} from "@akashnetwork/database/dbSchemas/akash"; import { asyncify, eachLimit } from "async"; import axios from "axios"; import { add, differenceInDays, differenceInHours, differenceInMinutes, isSameDay } from "date-fns"; diff --git a/apps/indexer/src/providers/statusEndpointHandlers/grpc.ts b/apps/indexer/src/providers/statusEndpointHandlers/grpc.ts index a40915f04..397862151 100644 --- a/apps/indexer/src/providers/statusEndpointHandlers/grpc.ts +++ b/apps/indexer/src/providers/statusEndpointHandlers/grpc.ts @@ -2,7 +2,7 @@ import { NodeResources } from "@akashnetwork/akash-api/akash/inventory/v1"; import { ResourcesMetric, Status } from "@akashnetwork/akash-api/akash/provider/v1"; import { ProviderRPCClient } from "@akashnetwork/akash-api/akash/provider/v1/grpc-js"; import { Empty } from "@akashnetwork/akash-api/google/protobuf"; -import { Provider } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider } from "@akashnetwork/database/dbSchemas/akash"; import memoize from "lodash/memoize"; import { promisify } from "util"; diff --git a/apps/indexer/src/providers/statusEndpointHandlers/rest.ts b/apps/indexer/src/providers/statusEndpointHandlers/rest.ts index 097d5e13f..5832cba4a 100644 --- a/apps/indexer/src/providers/statusEndpointHandlers/rest.ts +++ b/apps/indexer/src/providers/statusEndpointHandlers/rest.ts @@ -1,4 +1,4 @@ -import { Provider } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider } from "@akashnetwork/database/dbSchemas/akash"; import axios from "axios"; import https from "https"; diff --git a/apps/indexer/src/shared/constants.ts b/apps/indexer/src/shared/constants.ts index 40bcad1f0..15ffe62be 100644 --- a/apps/indexer/src/shared/constants.ts +++ b/apps/indexer/src/shared/constants.ts @@ -1,4 +1,4 @@ -import { activeChain } from "@akashnetwork/cloudmos-shared/chainDefinitions"; +import { activeChain } from "@akashnetwork/database/chainDefinitions"; import path from "path"; import { env } from "./utils/env"; diff --git a/apps/indexer/src/shared/utils/akashPaymentSettle.ts b/apps/indexer/src/shared/utils/akashPaymentSettle.ts index 2c64e0a8b..a1af7be58 100644 --- a/apps/indexer/src/shared/utils/akashPaymentSettle.ts +++ b/apps/indexer/src/shared/utils/akashPaymentSettle.ts @@ -1,4 +1,4 @@ -import { Deployment, Lease } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Deployment, Lease } from "@akashnetwork/database/dbSchemas/akash"; // This copies the logic of the akash node diff --git a/apps/indexer/src/tasks/providerUptimeTracker.ts b/apps/indexer/src/tasks/providerUptimeTracker.ts index f7af3d627..5d677ba41 100644 --- a/apps/indexer/src/tasks/providerUptimeTracker.ts +++ b/apps/indexer/src/tasks/providerUptimeTracker.ts @@ -1,4 +1,4 @@ -import { Provider } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; +import { Provider } from "@akashnetwork/database/dbSchemas/akash"; import { secondsInDay } from "date-fns"; import { QueryTypes } from "sequelize"; diff --git a/apps/indexer/src/tasks/usdSpendingTracker.ts b/apps/indexer/src/tasks/usdSpendingTracker.ts index 28884760a..cffaa5e7b 100644 --- a/apps/indexer/src/tasks/usdSpendingTracker.ts +++ b/apps/indexer/src/tasks/usdSpendingTracker.ts @@ -1,5 +1,5 @@ -import { AkashBlock } from "@akashnetwork/cloudmos-shared/dbSchemas/akash"; -import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base"; +import { AkashBlock } from "@akashnetwork/database/dbSchemas/akash"; +import { Day } from "@akashnetwork/database/dbSchemas/base"; import { Op } from "sequelize"; import { sequelize } from "@src/db/dbConnection"; diff --git a/package-lock.json b/package-lock.json index 199db7524..0512b0b04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "license": "Apache-2.0", "dependencies": { "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/cloudmos-shared": "*", + "@akashnetwork/database": "*", "@chain-registry/assets": "^0.7.1", "@cosmjs/crypto": "^0.28.11", "@cosmjs/encoding": "^0.28.11", @@ -358,7 +358,7 @@ "license": "Apache-2.0", "dependencies": { "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/cloudmos-shared": "*", + "@akashnetwork/database": "*", "@cosmjs/crypto": "^0.31.1", "@cosmjs/encoding": "^0.32.3", "@cosmjs/math": "^0.31.1", @@ -1196,8 +1196,8 @@ "follow-redirects": "^1.14.4" } }, - "node_modules/@akashnetwork/cloudmos-shared": { - "resolved": "packages/shared", + "node_modules/@akashnetwork/database": { + "resolved": "packages/database", "link": true }, "node_modules/@akashnetwork/dev-config": { @@ -37826,6 +37826,16 @@ "url": "https://github.com/sponsors/wooorm" } }, + "packages/database": { + "name": "@akashnetwork/database", + "version": "1.0.0", + "license": "Apache-2.0", + "dependencies": { + "dotenv": "^12.0.4", + "sequelize": "^6.21.3", + "sequelize-typescript": "^2.1.5" + } + }, "packages/dev-config": { "name": "@akashnetwork/dev-config", "version": "1.0.0", @@ -37839,16 +37849,6 @@ "prettier-plugin-tailwindcss": "^0.6.1" } }, - "packages/shared": { - "name": "@akashnetwork/cloudmos-shared", - "version": "1.0.0", - "license": "Apache-2.0", - "dependencies": { - "dotenv": "^12.0.4", - "sequelize": "^6.21.3", - "sequelize-typescript": "^2.1.5" - } - }, "packages/ui": { "name": "@akashnetwork/ui", "version": "1.0.0", diff --git a/packages/shared/.gitattributes b/packages/database/.gitattributes similarity index 100% rename from packages/shared/.gitattributes rename to packages/database/.gitattributes diff --git a/packages/shared/.gitignore b/packages/database/.gitignore similarity index 100% rename from packages/shared/.gitignore rename to packages/database/.gitignore diff --git a/packages/shared/.prettierrc b/packages/database/.prettierrc similarity index 100% rename from packages/shared/.prettierrc rename to packages/database/.prettierrc diff --git a/packages/shared/chainDefinitions.ts b/packages/database/chainDefinitions.ts similarity index 100% rename from packages/shared/chainDefinitions.ts rename to packages/database/chainDefinitions.ts diff --git a/packages/shared/dbSchemas/akash/akashBlock.ts b/packages/database/dbSchemas/akash/akashBlock.ts similarity index 100% rename from packages/shared/dbSchemas/akash/akashBlock.ts rename to packages/database/dbSchemas/akash/akashBlock.ts diff --git a/packages/shared/dbSchemas/akash/akashMessage.ts b/packages/database/dbSchemas/akash/akashMessage.ts similarity index 100% rename from packages/shared/dbSchemas/akash/akashMessage.ts rename to packages/database/dbSchemas/akash/akashMessage.ts diff --git a/packages/shared/dbSchemas/akash/bid.ts b/packages/database/dbSchemas/akash/bid.ts similarity index 100% rename from packages/shared/dbSchemas/akash/bid.ts rename to packages/database/dbSchemas/akash/bid.ts diff --git a/packages/shared/dbSchemas/akash/deployment.ts b/packages/database/dbSchemas/akash/deployment.ts similarity index 100% rename from packages/shared/dbSchemas/akash/deployment.ts rename to packages/database/dbSchemas/akash/deployment.ts diff --git a/packages/shared/dbSchemas/akash/deploymentGroup.ts b/packages/database/dbSchemas/akash/deploymentGroup.ts similarity index 100% rename from packages/shared/dbSchemas/akash/deploymentGroup.ts rename to packages/database/dbSchemas/akash/deploymentGroup.ts diff --git a/packages/shared/dbSchemas/akash/deploymentGroupResource.ts b/packages/database/dbSchemas/akash/deploymentGroupResource.ts similarity index 100% rename from packages/shared/dbSchemas/akash/deploymentGroupResource.ts rename to packages/database/dbSchemas/akash/deploymentGroupResource.ts diff --git a/packages/shared/dbSchemas/akash/index.ts b/packages/database/dbSchemas/akash/index.ts similarity index 100% rename from packages/shared/dbSchemas/akash/index.ts rename to packages/database/dbSchemas/akash/index.ts diff --git a/packages/shared/dbSchemas/akash/lease.ts b/packages/database/dbSchemas/akash/lease.ts similarity index 100% rename from packages/shared/dbSchemas/akash/lease.ts rename to packages/database/dbSchemas/akash/lease.ts diff --git a/packages/shared/dbSchemas/akash/provider.ts b/packages/database/dbSchemas/akash/provider.ts similarity index 100% rename from packages/shared/dbSchemas/akash/provider.ts rename to packages/database/dbSchemas/akash/provider.ts diff --git a/packages/shared/dbSchemas/akash/providerAttribute.ts b/packages/database/dbSchemas/akash/providerAttribute.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerAttribute.ts rename to packages/database/dbSchemas/akash/providerAttribute.ts diff --git a/packages/shared/dbSchemas/akash/providerAttributeSignature.ts b/packages/database/dbSchemas/akash/providerAttributeSignature.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerAttributeSignature.ts rename to packages/database/dbSchemas/akash/providerAttributeSignature.ts diff --git a/packages/shared/dbSchemas/akash/providerSnapshot.ts b/packages/database/dbSchemas/akash/providerSnapshot.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerSnapshot.ts rename to packages/database/dbSchemas/akash/providerSnapshot.ts diff --git a/packages/shared/dbSchemas/akash/providerSnapshotNode.ts b/packages/database/dbSchemas/akash/providerSnapshotNode.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerSnapshotNode.ts rename to packages/database/dbSchemas/akash/providerSnapshotNode.ts diff --git a/packages/shared/dbSchemas/akash/providerSnapshotNodeCPU.ts b/packages/database/dbSchemas/akash/providerSnapshotNodeCPU.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerSnapshotNodeCPU.ts rename to packages/database/dbSchemas/akash/providerSnapshotNodeCPU.ts diff --git a/packages/shared/dbSchemas/akash/providerSnapshotNodeGPU.ts b/packages/database/dbSchemas/akash/providerSnapshotNodeGPU.ts similarity index 100% rename from packages/shared/dbSchemas/akash/providerSnapshotNodeGPU.ts rename to packages/database/dbSchemas/akash/providerSnapshotNodeGPU.ts diff --git a/packages/shared/dbSchemas/base/addressReference.ts b/packages/database/dbSchemas/base/addressReference.ts similarity index 100% rename from packages/shared/dbSchemas/base/addressReference.ts rename to packages/database/dbSchemas/base/addressReference.ts diff --git a/packages/shared/dbSchemas/base/block.ts b/packages/database/dbSchemas/base/block.ts similarity index 100% rename from packages/shared/dbSchemas/base/block.ts rename to packages/database/dbSchemas/base/block.ts diff --git a/packages/shared/dbSchemas/base/day.ts b/packages/database/dbSchemas/base/day.ts similarity index 100% rename from packages/shared/dbSchemas/base/day.ts rename to packages/database/dbSchemas/base/day.ts diff --git a/packages/shared/dbSchemas/base/index.ts b/packages/database/dbSchemas/base/index.ts similarity index 100% rename from packages/shared/dbSchemas/base/index.ts rename to packages/database/dbSchemas/base/index.ts diff --git a/packages/shared/dbSchemas/base/message.ts b/packages/database/dbSchemas/base/message.ts similarity index 100% rename from packages/shared/dbSchemas/base/message.ts rename to packages/database/dbSchemas/base/message.ts diff --git a/packages/shared/dbSchemas/base/monitoredValue.ts b/packages/database/dbSchemas/base/monitoredValue.ts similarity index 100% rename from packages/shared/dbSchemas/base/monitoredValue.ts rename to packages/database/dbSchemas/base/monitoredValue.ts diff --git a/packages/shared/dbSchemas/base/transaction.ts b/packages/database/dbSchemas/base/transaction.ts similarity index 100% rename from packages/shared/dbSchemas/base/transaction.ts rename to packages/database/dbSchemas/base/transaction.ts diff --git a/packages/shared/dbSchemas/base/validator.ts b/packages/database/dbSchemas/base/validator.ts similarity index 100% rename from packages/shared/dbSchemas/base/validator.ts rename to packages/database/dbSchemas/base/validator.ts diff --git a/packages/shared/dbSchemas/decorators/requiredDecorator.ts b/packages/database/dbSchemas/decorators/requiredDecorator.ts similarity index 100% rename from packages/shared/dbSchemas/decorators/requiredDecorator.ts rename to packages/database/dbSchemas/decorators/requiredDecorator.ts diff --git a/packages/shared/dbSchemas/index.ts b/packages/database/dbSchemas/index.ts similarity index 100% rename from packages/shared/dbSchemas/index.ts rename to packages/database/dbSchemas/index.ts diff --git a/packages/shared/dbSchemas/user/index.ts b/packages/database/dbSchemas/user/index.ts similarity index 100% rename from packages/shared/dbSchemas/user/index.ts rename to packages/database/dbSchemas/user/index.ts diff --git a/packages/shared/dbSchemas/user/template.ts b/packages/database/dbSchemas/user/template.ts similarity index 100% rename from packages/shared/dbSchemas/user/template.ts rename to packages/database/dbSchemas/user/template.ts diff --git a/packages/shared/dbSchemas/user/templateFavorite.ts b/packages/database/dbSchemas/user/templateFavorite.ts similarity index 100% rename from packages/shared/dbSchemas/user/templateFavorite.ts rename to packages/database/dbSchemas/user/templateFavorite.ts diff --git a/packages/shared/dbSchemas/user/userAddressName.ts b/packages/database/dbSchemas/user/userAddressName.ts similarity index 100% rename from packages/shared/dbSchemas/user/userAddressName.ts rename to packages/database/dbSchemas/user/userAddressName.ts diff --git a/packages/shared/dbSchemas/user/userSetting.ts b/packages/database/dbSchemas/user/userSetting.ts similarity index 100% rename from packages/shared/dbSchemas/user/userSetting.ts rename to packages/database/dbSchemas/user/userSetting.ts diff --git a/packages/shared/package.json b/packages/database/package.json similarity index 89% rename from packages/shared/package.json rename to packages/database/package.json index 0ff09d2dd..8a7e793d1 100644 --- a/packages/shared/package.json +++ b/packages/database/package.json @@ -1,5 +1,5 @@ { - "name": "@akashnetwork/cloudmos-shared", + "name": "@akashnetwork/database", "version": "1.0.0", "description": "Code that is shared between multiple cloudmos project", "license": "Apache-2.0", diff --git a/packages/shared/plans.ts b/packages/database/plans.ts similarity index 100% rename from packages/shared/plans.ts rename to packages/database/plans.ts