From f1336a35fc2df2d9c7f4c1c376d0b38eb57de702 Mon Sep 17 00:00:00 2001 From: Erno Date: Tue, 25 Oct 2022 16:35:03 +0200 Subject: [PATCH 1/3] refactor: move core to common-core --- .changeset/afraid-coats-peel.md | 19 +++++++++++++++++++ .changeset/config.json | 14 +++++++------- README.md | 12 ++++++------ demos/express-proxy/package.json | 2 +- .../src/middlewares/errorHandler.ts | 2 +- demos/moralis-stream/package.json | 2 +- .../src/middlewares/errorHandler.ts | 2 +- demos/parse-server-migration/package.json | 2 +- .../scripts/utils/generateApiCloudCode.ts | 2 +- .../src/cloud/generated/evmApi.ts | 2 +- .../src/cloud/generated/solApi.ts | 2 +- demos/parse-server/package.json | 2 +- .../src/middlewares/errorHandler.ts | 2 +- .../src/utils/ParseServerRequest.ts | 2 +- demos/supabase-auth/package.json | 2 +- .../src/middlewares/errorHandler.ts | 2 +- jest.config.js | 2 +- packages/apiUtils/package.json | 2 +- packages/apiUtils/src/ApiUtils.ts | 2 +- .../apiUtils/src/config/ApiUtilsConfig.ts | 2 +- .../src/config/ApiUtilsConfigSetup.ts | 2 +- .../apiUtils/src/errors/isNotFoundError.ts | 2 +- .../resolvers/ApiPaginatedResultAdapter.ts | 2 +- .../src/resolvers/ApiResultAdapter.ts | 2 +- .../src/resolvers/DescriptorConverter.ts | 2 +- packages/apiUtils/src/resolvers/Endpoint.ts | 2 +- .../src/resolvers/EndpointResolver.test.ts | 2 +- .../src/resolvers/EndpointResolver.ts | 2 +- packages/apiUtils/src/resolvers/Endpoints.ts | 2 +- .../src/resolvers/PaginatedEndpoint.ts | 2 +- .../PaginatedEndpointResolver.test.ts | 2 +- .../resolvers/PaginatedEndpointResolver.ts | 2 +- .../src/resolvers/getCommonHeaders.ts | 2 +- .../OperationRequestBuilder.test.ts | 2 +- .../src/resolvers2/OperationRequestBuilder.ts | 2 +- .../src/resolvers2/OperationResolver.ts | 2 +- .../resolvers2/PaginatedOperationResolver.ts | 2 +- .../resolvers2/PaginatedResponseAdapter.ts | 2 +- .../apiUtils/src/resolvers2/Pagination.ts | 2 +- packages/apiUtils/src/test/setup.ts | 2 +- .../src/utils/tryGetNextPageParams.ts | 2 +- packages/auth/integration/setup.ts | 2 +- packages/auth/package.json | 2 +- packages/auth/src/MoralisAuth.ts | 2 +- packages/auth/src/methods/requestMessage.ts | 2 +- packages/auth/src/methods/verify.ts | 2 +- .../auth/src/resolvers/evmRequestChallenge.ts | 2 +- .../auth/src/resolvers/evmVerifyChallenge.ts | 2 +- .../auth/src/resolvers/solRequestChallenge.ts | 2 +- .../auth/src/resolvers/solVerifyChallenge.ts | 2 +- packages/{ => common}/core/.eslintrc.js | 0 packages/{ => common}/core/.gitignore | 0 packages/{ => common}/core/CHANGELOG.md | 2 +- packages/{ => common}/core/README.md | 10 +++++----- .../test/requestControllerDelete.test.ts | 0 .../test/requestControllerGet.test.ts | 0 .../test/requestControllerPost.test.ts | 0 .../test/requestControllerPut.test.ts | 0 packages/{ => common}/core/jest.config.js | 2 +- packages/{ => common}/core/package.json | 2 +- .../core/src/Assert/assertUnreachable.test.ts | 0 .../core/src/Assert/assertUnreachable.ts | 0 .../{ => common}/core/src/Assert/index.ts | 0 .../core/src/Config/Config.test.ts | 0 .../{ => common}/core/src/Config/Config.ts | 0 .../core/src/Config/CoreConfig.test.ts | 0 .../core/src/Config/CoreConfig.ts | 0 .../core/src/Config/CoreConfigSetup.ts | 0 .../core/src/Config/CoreConfigValidator.ts | 0 .../core/src/Config/MoralisConfig.ts | 2 +- .../{ => common}/core/src/Config/index.ts | 0 .../core/src/Config/interfaces/EvmChainish.ts | 0 .../src/Config/interfaces/SolNetworkish.ts | 0 .../core/src/Config/interfaces/index.ts | 0 .../{ => common}/core/src/Error/ErrorCode.ts | 0 .../core/src/Error/MoralisError.test.ts | 0 .../core/src/Error/MoralisError.ts | 0 packages/{ => common}/core/src/Error/index.ts | 0 .../core/src/Error/isMoralisError.test.ts | 0 .../core/src/Error/isMoralisError.ts | 0 .../core/src/Modules/ApiModule.ts | 0 .../core/src/Modules/Module.test.ts | 0 .../{ => common}/core/src/Modules/Module.ts | 0 .../core/src/Modules/ModuleName.ts | 0 .../core/src/Modules/ModuleType.ts | 0 .../core/src/Modules/Modules.test.ts | 0 .../{ => common}/core/src/Modules/Modules.ts | 0 .../{ => common}/core/src/Modules/index.ts | 0 .../{ => common}/core/src/Modules/types.ts | 0 .../{ => common}/core/src/Modules/utils.ts | 0 packages/{ => common}/core/src/MoralisCore.ts | 0 .../core/src/MoralisCoreProvider.ts | 0 .../core/src/controllers/AxiosRetry.test.ts | 0 .../core/src/controllers/AxiosRetry.ts | 0 .../src/controllers/LoggerController.test.ts | 0 .../core/src/controllers/LoggerController.ts | 0 .../RequestController/ApiRequestError.ts | 0 .../RequestController/RequestController.ts | 0 .../controllers/RequestController/index.ts | 0 .../core/src/controllers/index.ts | 0 .../src/dataTypes/BigNumber/BigNumber.test.ts | 0 .../core/src/dataTypes/BigNumber/BigNumber.ts | 0 .../BigNumber/BigNumberFormatter.test.ts | 0 .../dataTypes/BigNumber/BigNumberFormatter.ts | 0 .../BigNumber/BigNumberParser.test.ts | 0 .../dataTypes/BigNumber/BigNumberParser.ts | 0 .../core/src/dataTypes/BigNumber/index.ts | 0 .../src/dataTypes/abstract/MoralisData.ts | 0 .../dataTypes/abstract/MoralisObjectData.ts | 0 .../core/src/dataTypes/abstract/index.ts | 0 .../core/src/dataTypes/abstract/types.ts | 0 .../{ => common}/core/src/dataTypes/date.ts | 0 .../{ => common}/core/src/dataTypes/index.ts | 0 .../core/src/environment/isTest.test.ts | 0 .../core/src/environment/isTest.ts | 0 packages/{ => common}/core/src/index.ts | 0 .../core/src/operations/Operation.ts | 0 .../OperationRequestValidator.test.ts | 0 .../operations/OperationRequestValidator.ts | 0 .../core/src/operations/PaginatedOperation.ts | 0 .../{ => common}/core/src/operations/index.ts | 0 .../core/src/test/MoralisData.test.ts | 0 .../core/src/test/MoralisObjectData.test.ts | 0 packages/{ => common}/core/src/utils/index.ts | 0 packages/{ => common}/core/src/utils/maybe.ts | 0 .../{ => common}/core/src/utils/noop.test.ts | 0 packages/{ => common}/core/src/utils/noop.ts | 0 .../core/src/utils/toCamelCase.ts | 0 .../{ => common}/core/tsconfig.build.json | 0 packages/{ => common}/core/tsconfig.json | 2 +- packages/common/evmUtils/package.json | 2 +- .../common/evmUtils/src/CommonEvmUtils.ts | 2 +- .../common/evmUtils/src/EvmChainResolver.ts | 2 +- .../src/config/CommonEvmUtilsConfig.test.ts | 2 +- .../src/config/CommonEvmUtilsConfig.ts | 2 +- .../src/config/CommonEvmUtilsConfigSetup.ts | 2 +- .../evmUtils/src/dataTypes/Erc20/Erc20.ts | 2 +- .../dataTypes/Erc20Transfer/Erc20Transfer.ts | 2 +- .../src/dataTypes/Erc20Transfer/types.ts | 2 +- .../dataTypes/Erc20Value/Erc20Value.test.ts | 2 +- .../src/dataTypes/Erc20Value/Erc20Value.ts | 2 +- .../dataTypes/EvmAddress/EvmAddress.test.ts | 2 +- .../src/dataTypes/EvmAddress/EvmAddress.ts | 2 +- .../src/dataTypes/EvmBlock/EvmBlock.ts | 2 +- .../src/dataTypes/EvmBlock/EvmSimpleBlock.ts | 2 +- .../evmUtils/src/dataTypes/EvmBlock/types.ts | 2 +- .../src/dataTypes/EvmChain/EvmChain.test.ts | 2 +- .../src/dataTypes/EvmChain/EvmChain.ts | 2 +- .../src/dataTypes/EvmChain/EvmChainParser.ts | 2 +- .../src/dataTypes/EvmEvent/EvmEvent.ts | 2 +- .../evmUtils/src/dataTypes/EvmEvent/types.ts | 2 +- .../src/dataTypes/EvmNative/EvmNative.ts | 2 +- .../evmUtils/src/dataTypes/EvmNft/EvmNft.ts | 2 +- .../evmUtils/src/dataTypes/EvmNft/types.ts | 2 +- .../EvmNftCollection/EvmNftCollection.test.ts | 2 +- .../EvmNftCollection/EvmNftCollection.ts | 2 +- .../EvmNftMetadata/EvmNftMetadata.ts | 2 +- .../src/dataTypes/EvmNftMetadata/types.ts | 2 +- .../src/dataTypes/EvmNftTrade/EvmNftTrade.ts | 2 +- .../src/dataTypes/EvmNftTrade/types.ts | 2 +- .../EvmNftTransfer/EvmNftTransfer.ts | 2 +- .../src/dataTypes/EvmNftTransfer/types.ts | 2 +- .../EvmSignature/EvmSignature.test.ts | 2 +- .../dataTypes/EvmSignature/EvmSignature.ts | 2 +- .../EvmTransaction/EvmTransaction.ts | 2 +- .../src/dataTypes/EvmTransaction/types.ts | 2 +- .../EvmTransactionLog/EvmTransactionLog.ts | 2 +- .../src/operations/operations.test.ts | 2 +- .../token/getWalletTokenTransfersOperation.ts | 2 +- .../utils/runContractFunctionOperation.ts | 2 +- packages/common/evmUtils/src/test/setup.ts | 2 +- packages/common/solUtils/package.json | 2 +- .../common/solUtils/src/CommonSolUtils.ts | 2 +- .../common/solUtils/src/SolNetworkResolver.ts | 2 +- .../src/config/CommonSolUtilsConfig.ts | 2 +- .../src/config/CommonSolUtilsConfigSetup.ts | 2 +- .../src/dataTypes/SolAddress/SolAddress.ts | 2 +- .../src/dataTypes/SolNative/SolNative.test.ts | 2 +- .../src/dataTypes/SolNative/SolNative.ts | 2 +- .../src/dataTypes/SolNetwork/SolNetwork.ts | 2 +- .../operations/account/getBalanceOperation.ts | 2 +- .../operations/account/getNFTsOperation.ts | 2 +- .../account/getPortfolioOperation.ts | 2 +- .../src/operations/account/getSPLOperation.ts | 2 +- .../operations/nft/getNFTMetadataOperation.ts | 2 +- .../token/getTokenPriceOperation.ts | 2 +- packages/common/streamsUtils/package.json | 2 +- .../src/dataTypes/EvmStream/EvmStream.test.ts | 2 +- .../src/dataTypes/EvmStream/EvmStream.ts | 2 +- .../EvmStreamResult/EvmStreamResult.test.ts | 2 +- .../EvmStreamResult/EvmStreamResult.ts | 2 +- .../EvmStreamResult/EvmStreamResultParser.ts | 2 +- .../StreamErc1155Approval.test.ts | 2 +- .../StreamErc1155Approval.ts | 2 +- .../StreamErc20Approval.test.ts | 2 +- .../StreamErc20Approval.ts | 2 +- .../dataTypes/StreamErc20Approval/types.ts | 2 +- .../StreamErc20Transfer.test.ts | 2 +- .../StreamErc20Transfer.ts | 2 +- .../dataTypes/StreamErc20Transfer/types.ts | 2 +- .../StreamErc721Approval.test.ts | 2 +- .../StreamErc721Approval.ts | 2 +- .../StreamEvmInternalTransaction.test.ts | 2 +- .../StreamEvmInternalTransaction.ts | 2 +- .../StreamEvmInternalTransaction/types.ts | 2 +- .../StreamEvmNftTransfer.test.ts | 2 +- .../StreamEvmNftTransfer.ts | 2 +- .../StreamEvmTransaction.test.ts | 2 +- .../StreamEvmTransaction.ts | 2 +- .../dataTypes/StreamEvmTransaction/types.ts | 2 +- .../StreamEvmTransactionLog.test.ts | 2 +- .../StreamEvmTransactionLog.ts | 2 +- .../common/streamsUtils/src/test/setup.ts | 2 +- packages/core/src/version.ts | 1 + packages/evmApi/CHANGELOG.md | 2 +- packages/evmApi/integration/setup.ts | 2 +- packages/evmApi/package.json | 2 +- packages/evmApi/src/EvmApi.test.ts | 2 +- packages/evmApi/src/EvmApi.ts | 2 +- packages/evmApi/src/config/EvmApiConfig.ts | 2 +- .../evmApi/src/config/EvmApiConfigSetup.ts | 2 +- .../evmApi/src/resolvers/EvmChainResolver.ts | 2 +- .../src/resolvers/balance/getNativeBalance.ts | 2 +- .../evmApi/src/resolvers/block/getBlock.ts | 2 +- .../src/resolvers/block/getDateToBlock.ts | 2 +- .../src/resolvers/defi/getPairAddress.ts | 2 +- .../src/resolvers/defi/getPairReserves.ts | 2 +- .../src/resolvers/events/getContractEvents.ts | 2 +- .../src/resolvers/events/getContractLogs.ts | 2 +- .../src/resolvers/nft/getContractNFTs.ts | 2 +- .../resolvers/nft/getNFTContractMetadata.ts | 2 +- .../resolvers/nft/getNFTContractTransfers.ts | 2 +- .../src/resolvers/nft/getNFTLowestPrice.ts | 2 +- .../src/resolvers/nft/getNFTMetadata.ts | 2 +- .../evmApi/src/resolvers/nft/getNFTOwners.ts | 2 +- .../src/resolvers/nft/getNFTTokenIdOwners.ts | 2 +- .../evmApi/src/resolvers/nft/getNFTTrades.ts | 2 +- .../src/resolvers/nft/getNFTTransfers.ts | 2 +- .../resolvers/nft/getNFTTransfersByBlock.ts | 2 +- .../nft/getNFTTransfersFromToBlock.ts | 2 +- .../resolvers/nft/getWalletNFTCollections.ts | 2 +- .../resolvers/nft/getWalletNFTTransfers.ts | 2 +- .../evmApi/src/resolvers/nft/getWalletNFTs.ts | 2 +- .../src/resolvers/nft/reSyncMetadata.ts | 2 +- .../evmApi/src/resolvers/nft/searchNFTs.ts | 2 +- .../src/resolvers/nft/syncNFTContract.ts | 2 +- .../src/resolvers/resolve/resolveAddress.ts | 2 +- .../src/resolvers/token/getTokenAllowance.ts | 2 +- .../src/resolvers/token/getTokenMetadata.ts | 2 +- .../token/getTokenMetadataBySymbol.ts | 2 +- .../src/resolvers/token/getTokenPrice.ts | 2 +- .../src/resolvers/token/getTokenTransfers.ts | 2 +- .../resolvers/token/getWalletTokenBalances.ts | 2 +- .../token/getWalletTokenTransfers.ts | 2 +- .../resolvers/transaction/getTransaction.ts | 2 +- .../transaction/getWalletTransactions.ts | 2 +- packages/moralis/CHANGELOG.md | 2 +- packages/moralis/package.json | 8 ++++---- packages/moralis/src/commonCore/index.ts | 1 + packages/moralis/src/core/index.ts | 1 - packages/moralis/src/index.ts | 2 +- packages/solApi/integration/setup.ts | 2 +- packages/solApi/package.json | 2 +- packages/solApi/src/SolApi.ts | 2 +- packages/streams/integration/setup.ts | 2 +- packages/streams/package.json | 2 +- packages/streams/src/MoralisStreams.ts | 2 +- packages/streams/src/methods/logParser.ts | 2 +- .../streams/src/methods/verifySignature.ts | 2 +- .../src/resolvers/evmStreams/addAddressEvm.ts | 2 +- .../resolvers/evmStreams/createStreamEvm.ts | 2 +- .../resolvers/evmStreams/deleteAddressEvm.ts | 2 +- .../resolvers/evmStreams/updateStreamEvm.ts | 2 +- packages/streams/src/test/setup.ts | 2 +- .../src/utils/IncorrectNetworkError.ts | 2 +- 275 files changed, 236 insertions(+), 216 deletions(-) create mode 100644 .changeset/afraid-coats-peel.md rename packages/{ => common}/core/.eslintrc.js (100%) rename packages/{ => common}/core/.gitignore (100%) rename packages/{ => common}/core/CHANGELOG.md (99%) rename packages/{ => common}/core/README.md (94%) rename packages/{ => common}/core/integration/test/requestControllerDelete.test.ts (100%) rename packages/{ => common}/core/integration/test/requestControllerGet.test.ts (100%) rename packages/{ => common}/core/integration/test/requestControllerPost.test.ts (100%) rename packages/{ => common}/core/integration/test/requestControllerPut.test.ts (100%) rename packages/{ => common}/core/jest.config.js (60%) rename packages/{ => common}/core/package.json (96%) rename packages/{ => common}/core/src/Assert/assertUnreachable.test.ts (100%) rename packages/{ => common}/core/src/Assert/assertUnreachable.ts (100%) rename packages/{ => common}/core/src/Assert/index.ts (100%) rename packages/{ => common}/core/src/Config/Config.test.ts (100%) rename packages/{ => common}/core/src/Config/Config.ts (100%) rename packages/{ => common}/core/src/Config/CoreConfig.test.ts (100%) rename packages/{ => common}/core/src/Config/CoreConfig.ts (100%) rename packages/{ => common}/core/src/Config/CoreConfigSetup.ts (100%) rename packages/{ => common}/core/src/Config/CoreConfigValidator.ts (100%) rename packages/{ => common}/core/src/Config/MoralisConfig.ts (97%) rename packages/{ => common}/core/src/Config/index.ts (100%) rename packages/{ => common}/core/src/Config/interfaces/EvmChainish.ts (100%) rename packages/{ => common}/core/src/Config/interfaces/SolNetworkish.ts (100%) rename packages/{ => common}/core/src/Config/interfaces/index.ts (100%) rename packages/{ => common}/core/src/Error/ErrorCode.ts (100%) rename packages/{ => common}/core/src/Error/MoralisError.test.ts (100%) rename packages/{ => common}/core/src/Error/MoralisError.ts (100%) rename packages/{ => common}/core/src/Error/index.ts (100%) rename packages/{ => common}/core/src/Error/isMoralisError.test.ts (100%) rename packages/{ => common}/core/src/Error/isMoralisError.ts (100%) rename packages/{ => common}/core/src/Modules/ApiModule.ts (100%) rename packages/{ => common}/core/src/Modules/Module.test.ts (100%) rename packages/{ => common}/core/src/Modules/Module.ts (100%) rename packages/{ => common}/core/src/Modules/ModuleName.ts (100%) rename packages/{ => common}/core/src/Modules/ModuleType.ts (100%) rename packages/{ => common}/core/src/Modules/Modules.test.ts (100%) rename packages/{ => common}/core/src/Modules/Modules.ts (100%) rename packages/{ => common}/core/src/Modules/index.ts (100%) rename packages/{ => common}/core/src/Modules/types.ts (100%) rename packages/{ => common}/core/src/Modules/utils.ts (100%) rename packages/{ => common}/core/src/MoralisCore.ts (100%) rename packages/{ => common}/core/src/MoralisCoreProvider.ts (100%) rename packages/{ => common}/core/src/controllers/AxiosRetry.test.ts (100%) rename packages/{ => common}/core/src/controllers/AxiosRetry.ts (100%) rename packages/{ => common}/core/src/controllers/LoggerController.test.ts (100%) rename packages/{ => common}/core/src/controllers/LoggerController.ts (100%) rename packages/{ => common}/core/src/controllers/RequestController/ApiRequestError.ts (100%) rename packages/{ => common}/core/src/controllers/RequestController/RequestController.ts (100%) rename packages/{ => common}/core/src/controllers/RequestController/index.ts (100%) rename packages/{ => common}/core/src/controllers/index.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumber.test.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumber.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumberFormatter.test.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumberFormatter.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumberParser.test.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/BigNumberParser.ts (100%) rename packages/{ => common}/core/src/dataTypes/BigNumber/index.ts (100%) rename packages/{ => common}/core/src/dataTypes/abstract/MoralisData.ts (100%) rename packages/{ => common}/core/src/dataTypes/abstract/MoralisObjectData.ts (100%) rename packages/{ => common}/core/src/dataTypes/abstract/index.ts (100%) rename packages/{ => common}/core/src/dataTypes/abstract/types.ts (100%) rename packages/{ => common}/core/src/dataTypes/date.ts (100%) rename packages/{ => common}/core/src/dataTypes/index.ts (100%) rename packages/{ => common}/core/src/environment/isTest.test.ts (100%) rename packages/{ => common}/core/src/environment/isTest.ts (100%) rename packages/{ => common}/core/src/index.ts (100%) rename packages/{ => common}/core/src/operations/Operation.ts (100%) rename packages/{ => common}/core/src/operations/OperationRequestValidator.test.ts (100%) rename packages/{ => common}/core/src/operations/OperationRequestValidator.ts (100%) rename packages/{ => common}/core/src/operations/PaginatedOperation.ts (100%) rename packages/{ => common}/core/src/operations/index.ts (100%) rename packages/{ => common}/core/src/test/MoralisData.test.ts (100%) rename packages/{ => common}/core/src/test/MoralisObjectData.test.ts (100%) rename packages/{ => common}/core/src/utils/index.ts (100%) rename packages/{ => common}/core/src/utils/maybe.ts (100%) rename packages/{ => common}/core/src/utils/noop.test.ts (100%) rename packages/{ => common}/core/src/utils/noop.ts (100%) rename packages/{ => common}/core/src/utils/toCamelCase.ts (100%) rename packages/{ => common}/core/tsconfig.build.json (100%) rename packages/{ => common}/core/tsconfig.json (65%) create mode 100644 packages/core/src/version.ts create mode 100644 packages/moralis/src/commonCore/index.ts delete mode 100644 packages/moralis/src/core/index.ts diff --git a/.changeset/afraid-coats-peel.md b/.changeset/afraid-coats-peel.md new file mode 100644 index 0000000000..0341139004 --- /dev/null +++ b/.changeset/afraid-coats-peel.md @@ -0,0 +1,19 @@ +--- +'demo-parse-server-migration': minor +'@moralisweb3/api-utils': minor +'@moralisweb3/auth': minor +'@moralisweb3/client-firebase-auth-utils': minor +'@moralisweb3/client-firebase-evm-auth': minor +'@moralisweb3/client-firebase-sol-auth': minor +'@moralisweb3/common-core': minor +'@moralisweb3/common-evm-utils': minor +'@moralisweb3/common-sol-utils': minor +'@moralisweb3/common-streams-utils': minor +'@moralisweb3/evm-api': minor +'moralis': minor +'@moralisweb3/sol-api': minor +'@moralisweb3/streams': minor +'@moralisweb3/test-utils': minor +--- + +Move `@moralisweb3/core` package to `@moralisweb3/common-core` diff --git a/.changeset/config.json b/.changeset/config.json index 35aa94487f..bcc8a88667 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -4,19 +4,19 @@ "commit": false, "fixed": [ [ - "moralis", - "@moralisweb3/core", - "@moralisweb3/auth", - "@moralisweb3/streams", "@moralisweb3/api-utils", + "@moralisweb3/auth", + "@moralisweb3/client-firebase-auth-utils", + "@moralisweb3/client-firebase-evm-auth", + "@moralisweb3/client-firebase-sol-auth", + "@moralisweb3/common-core", "@moralisweb3/common-evm-utils", "@moralisweb3/common-sol-utils", "@moralisweb3/common-streams-utils", "@moralisweb3/evm-api", "@moralisweb3/sol-api", - "@moralisweb3/client-firebase-auth-utils", - "@moralisweb3/client-firebase-evm-auth", - "@moralisweb3/client-firebase-sol-auth" + "@moralisweb3/streams", + "moralis" ] ], "linked": [], diff --git a/README.md b/README.md index cedd9681ab..5d95bb092a 100644 --- a/README.md +++ b/README.md @@ -115,20 +115,20 @@ It's possible to install all functionalities of Moralis by installing `moralis` ## 1. Install the dependencies -Instead of installing `moralis` you can need to install the packages that you want to use. You always need to install the `@moralisweb3/core` package. For example: +Instead of installing `moralis` you can need to install the packages that you want to use. You always need to install the `@moralisweb3/common-core` package. For example: ```shell -yarn add @moralisweb3/core @moralisweb3/evm @moralisweb3/evm-api @moralisweb3/evm-wallet-connect-connector +yarn add @moralisweb3/common-core @moralisweb3/evm @moralisweb3/evm-api @moralisweb3/evm-wallet-connect-connector ``` Then at the top of your code (before any interaction with Moralis), you need to register the modules to the core package ```javascript -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import MoralisEvmApi from '@moralisweb3/evm-api'; const core = MoralisCore.create(); -// Register all imported modules to the @moralisweb3/core module +// Register all imported modules to the @moralisweb3/common-core module core.registerModules([MoralisEvmApi]); ``` @@ -162,7 +162,7 @@ Of course you are free to combine the modules in a single object, and use that i ```javascript // moralis.ts -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import EvmApi from '@moralisweb3/evm-api'; const core = MoralisCore.create(); @@ -193,7 +193,7 @@ The core module is required in all applications. It will handle global dependenc | package | Changelog | Description | | ---------------------------------------------- |--------- | ------------------------------------------------------------------------------------ | -| [@moralisweb3/core](./packages/core) | [CHANGELOG.md](./packages/core/CHANGELOG.md) | Core logic, responsible for core logic and sharing state and events between packages | +| [@moralisweb3/common-core](./packages/common/core) | [CHANGELOG.md](./packages/common/core/CHANGELOG.md) | Core logic, responsible for core logic and sharing state and events between packages | ## Utilities diff --git a/demos/express-proxy/package.json b/demos/express-proxy/package.json index ee8227bfe5..ad139584e3 100644 --- a/demos/express-proxy/package.json +++ b/demos/express-proxy/package.json @@ -4,7 +4,7 @@ "main": "dist/index.js", "private": true, "dependencies": { - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@types/express-rate-limit": "^6.0.0", "dotenv": "^16.0.1", "envalid": "7.3.1", diff --git a/demos/express-proxy/src/middlewares/errorHandler.ts b/demos/express-proxy/src/middlewares/errorHandler.ts index 3d47022596..34d4e531bb 100644 --- a/demos/express-proxy/src/middlewares/errorHandler.ts +++ b/demos/express-proxy/src/middlewares/errorHandler.ts @@ -1,4 +1,4 @@ -import { MoralisError, isMoralisError } from '@moralisweb3/core'; +import { MoralisError, isMoralisError } from '@moralisweb3/common-core'; import { NextFunction, Request, Response } from 'express'; import { AxiosError } from 'axios'; diff --git a/demos/moralis-stream/package.json b/demos/moralis-stream/package.json index d9dc0b6961..18f07e0b51 100644 --- a/demos/moralis-stream/package.json +++ b/demos/moralis-stream/package.json @@ -4,7 +4,7 @@ "main": "dist/index.js", "private": true, "dependencies": { - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "dotenv": "^16.0.1", "envalid": "7.3.1", "express": "^4.18.1", diff --git a/demos/moralis-stream/src/middlewares/errorHandler.ts b/demos/moralis-stream/src/middlewares/errorHandler.ts index aac106a2da..d592eba473 100644 --- a/demos/moralis-stream/src/middlewares/errorHandler.ts +++ b/demos/moralis-stream/src/middlewares/errorHandler.ts @@ -1,4 +1,4 @@ -import { MoralisError, isMoralisError } from '@moralisweb3/core'; +import { MoralisError, isMoralisError } from '@moralisweb3/common-core'; import { NextFunction, Request, Response } from 'express'; import { AxiosError } from 'axios'; diff --git a/demos/parse-server-migration/package.json b/demos/parse-server-migration/package.json index 49069e2b7c..704b25e471 100644 --- a/demos/parse-server-migration/package.json +++ b/demos/parse-server-migration/package.json @@ -5,7 +5,7 @@ "private": true, "dependencies": { "@codemirror/language": "^0.20.0", - "@moralisweb3/core": "^2.2.0", + "@moralisweb3/common-core": "^2.6.7", "@types/node": "^18.7.15", "dotenv": "^16.0.1", "envalid": "7.3.1", diff --git a/demos/parse-server-migration/scripts/utils/generateApiCloudCode.ts b/demos/parse-server-migration/scripts/utils/generateApiCloudCode.ts index d498c8cc1a..4b6384849d 100644 --- a/demos/parse-server-migration/scripts/utils/generateApiCloudCode.ts +++ b/demos/parse-server-migration/scripts/utils/generateApiCloudCode.ts @@ -34,7 +34,7 @@ const generateAllCloudCode = (module: Module, endpoints: Endpoint[]) => { let output = `/* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-explicit-any */ import Moralis from 'moralis' -import { MoralisError } from '@moralisweb3/core'; +import { MoralisError } from '@moralisweb3/common-core'; import { handleRateLimit } from '../../rateLimit' import { AxiosError } from 'axios' declare const Parse: any; diff --git a/demos/parse-server-migration/src/cloud/generated/evmApi.ts b/demos/parse-server-migration/src/cloud/generated/evmApi.ts index 2aa2ce4c7e..7bdc8d6548 100644 --- a/demos/parse-server-migration/src/cloud/generated/evmApi.ts +++ b/demos/parse-server-migration/src/cloud/generated/evmApi.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-explicit-any */ import Moralis from 'moralis' -import { MoralisError } from '@moralisweb3/core'; +import { MoralisError } from '@moralisweb3/common-core'; import { handleRateLimit } from '../../rateLimit' import { AxiosError } from 'axios' declare const Parse: any; diff --git a/demos/parse-server-migration/src/cloud/generated/solApi.ts b/demos/parse-server-migration/src/cloud/generated/solApi.ts index 8c99b9d74d..da84a57cd3 100644 --- a/demos/parse-server-migration/src/cloud/generated/solApi.ts +++ b/demos/parse-server-migration/src/cloud/generated/solApi.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-explicit-any */ import Moralis from 'moralis' -import { MoralisError } from '@moralisweb3/core'; +import { MoralisError } from '@moralisweb3/common-core'; import { handleRateLimit } from '../../rateLimit' import { AxiosError } from 'axios' declare const Parse: any; diff --git a/demos/parse-server/package.json b/demos/parse-server/package.json index 215e4e0223..4c19a97dbd 100644 --- a/demos/parse-server/package.json +++ b/demos/parse-server/package.json @@ -5,7 +5,7 @@ "private": true, "dependencies": { "@codemirror/language": "^0.20.0", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "dotenv": "^16.0.1", "envalid": "7.3.1", "express": "^4.18.1", diff --git a/demos/parse-server/src/middlewares/errorHandler.ts b/demos/parse-server/src/middlewares/errorHandler.ts index 15150f3d7d..6e386c22b1 100644 --- a/demos/parse-server/src/middlewares/errorHandler.ts +++ b/demos/parse-server/src/middlewares/errorHandler.ts @@ -1,4 +1,4 @@ -import { isMoralisError, MoralisError } from '@moralisweb3/core'; +import { isMoralisError, MoralisError } from '@moralisweb3/common-core'; import { NextFunction, Request, Response } from 'express'; import { AxiosError } from 'axios'; diff --git a/demos/parse-server/src/utils/ParseServerRequest.ts b/demos/parse-server/src/utils/ParseServerRequest.ts index 1778e09084..b122cd3ee3 100644 --- a/demos/parse-server/src/utils/ParseServerRequest.ts +++ b/demos/parse-server/src/utils/ParseServerRequest.ts @@ -1,4 +1,4 @@ -import { MoralisCoreProvider, RequestController } from '@moralisweb3/core'; +import { MoralisCoreProvider, RequestController } from '@moralisweb3/common-core'; import config from '../config'; export class ParseServerRequest { diff --git a/demos/supabase-auth/package.json b/demos/supabase-auth/package.json index ec70c6c6a8..a23917c2d5 100644 --- a/demos/supabase-auth/package.json +++ b/demos/supabase-auth/package.json @@ -4,7 +4,7 @@ "main": "dist/index.js", "private": true, "dependencies": { - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@supabase/supabase-js": "^1.35.4", "dotenv": "^16.0.1", "envalid": "7.3.1", diff --git a/demos/supabase-auth/src/middlewares/errorHandler.ts b/demos/supabase-auth/src/middlewares/errorHandler.ts index c84de31161..6d5ab96637 100644 --- a/demos/supabase-auth/src/middlewares/errorHandler.ts +++ b/demos/supabase-auth/src/middlewares/errorHandler.ts @@ -1,4 +1,4 @@ -import { MoralisError } from '@moralisweb3/core'; +import { MoralisError } from '@moralisweb3/common-core'; import { NextFunction, Request, Response } from 'express'; const makeMoralisErrorMessage = (error: MoralisError) => { diff --git a/jest.config.js b/jest.config.js index 430daf3a1f..012dabb6e3 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,7 +10,7 @@ module.exports = { '^@moralisweb3/api-utils': path.join(__dirname, 'packages/apiUtils/src'), '^@moralisweb3/test-utils': path.join(__dirname, 'packages/testUtils/src'), '^@moralisweb3/common-streams-utils': path.join(__dirname, 'packages/common/streamsUtils/src'), - '^@moralisweb3/core': path.join(__dirname, 'packages/core/src'), + '^@moralisweb3/common-core': path.join(__dirname, 'packages/common/core/src'), '^@moralisweb3/(.*)$': path.join(__dirname, 'packages/$1/src'), }, modulePaths: [''], diff --git a/packages/apiUtils/package.json b/packages/apiUtils/package.json index 4519a57edd..316d73dafb 100644 --- a/packages/apiUtils/package.json +++ b/packages/apiUtils/package.json @@ -25,6 +25,6 @@ "@moralisweb3/common-evm-utils": "^2.6.7" }, "dependencies": { - "@moralisweb3/core": "^2.6.7" + "@moralisweb3/common-core": "^2.6.7" } } diff --git a/packages/apiUtils/src/ApiUtils.ts b/packages/apiUtils/src/ApiUtils.ts index fe2485cef8..c2c96dfc46 100644 --- a/packages/apiUtils/src/ApiUtils.ts +++ b/packages/apiUtils/src/ApiUtils.ts @@ -1,4 +1,4 @@ -import { Module, MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { Module, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { ApiUtilsConfigSetup } from './config/ApiUtilsConfigSetup'; export class ApiUtils extends Module { diff --git a/packages/apiUtils/src/config/ApiUtilsConfig.ts b/packages/apiUtils/src/config/ApiUtilsConfig.ts index b0bd5344b1..f914e3eb70 100644 --- a/packages/apiUtils/src/config/ApiUtilsConfig.ts +++ b/packages/apiUtils/src/config/ApiUtilsConfig.ts @@ -1,4 +1,4 @@ -import { ConfigKey } from '@moralisweb3/core'; +import { ConfigKey } from '@moralisweb3/common-core'; export const ApiUtilsConfig = { apiKey: { diff --git a/packages/apiUtils/src/config/ApiUtilsConfigSetup.ts b/packages/apiUtils/src/config/ApiUtilsConfigSetup.ts index 103c67604f..f705b6af7e 100644 --- a/packages/apiUtils/src/config/ApiUtilsConfigSetup.ts +++ b/packages/apiUtils/src/config/ApiUtilsConfigSetup.ts @@ -1,4 +1,4 @@ -import { Config } from '@moralisweb3/core'; +import { Config } from '@moralisweb3/common-core'; import { ApiUtilsConfig } from './ApiUtilsConfig'; export class ApiUtilsConfigSetup { diff --git a/packages/apiUtils/src/errors/isNotFoundError.ts b/packages/apiUtils/src/errors/isNotFoundError.ts index 51357fbe88..11b59b8e2e 100644 --- a/packages/apiUtils/src/errors/isNotFoundError.ts +++ b/packages/apiUtils/src/errors/isNotFoundError.ts @@ -1,4 +1,4 @@ -import { ApiErrorCode, isMoralisError } from '@moralisweb3/core'; +import { ApiErrorCode, isMoralisError } from '@moralisweb3/common-core'; export function isNotFoundError(e: unknown): boolean { if (isMoralisError(e)) { diff --git a/packages/apiUtils/src/resolvers/ApiPaginatedResultAdapter.ts b/packages/apiUtils/src/resolvers/ApiPaginatedResultAdapter.ts index f48a3e5d60..f9075a15fc 100644 --- a/packages/apiUtils/src/resolvers/ApiPaginatedResultAdapter.ts +++ b/packages/apiUtils/src/resolvers/ApiPaginatedResultAdapter.ts @@ -1,4 +1,4 @@ -import { ApiErrorCode, MoralisApiError } from '@moralisweb3/core'; +import { ApiErrorCode, MoralisApiError } from '@moralisweb3/common-core'; import { ApiResultAdapter } from './ApiResultAdapter'; import { PaginatedResult } from './PaginatedEndpoint'; diff --git a/packages/apiUtils/src/resolvers/ApiResultAdapter.ts b/packages/apiUtils/src/resolvers/ApiResultAdapter.ts index 587a231f41..62022472e4 100644 --- a/packages/apiUtils/src/resolvers/ApiResultAdapter.ts +++ b/packages/apiUtils/src/resolvers/ApiResultAdapter.ts @@ -1,4 +1,4 @@ -import { ApiErrorCode, MoralisApiError, MoralisData, MoralisDataObject } from '@moralisweb3/core'; +import { ApiErrorCode, MoralisApiError, MoralisData, MoralisDataObject } from '@moralisweb3/common-core'; // TODO: make part of core config? The challenge in that case is to make sure it is Typed correctly export enum ApiFormatType { diff --git a/packages/apiUtils/src/resolvers/DescriptorConverter.ts b/packages/apiUtils/src/resolvers/DescriptorConverter.ts index 33726f5103..b2f01abc82 100644 --- a/packages/apiUtils/src/resolvers/DescriptorConverter.ts +++ b/packages/apiUtils/src/resolvers/DescriptorConverter.ts @@ -1,4 +1,4 @@ -import { Operation } from '@moralisweb3/core'; +import { Operation } from '@moralisweb3/common-core'; import { EndpointMethod } from './Endpoint'; import { EndpointDescriptor } from './Endpoints'; diff --git a/packages/apiUtils/src/resolvers/Endpoint.ts b/packages/apiUtils/src/resolvers/Endpoint.ts index 509097beb7..1cdb369c13 100644 --- a/packages/apiUtils/src/resolvers/Endpoint.ts +++ b/packages/apiUtils/src/resolvers/Endpoint.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; export type EndpointMethod = 'get' | 'post' | 'put' | 'delete'; diff --git a/packages/apiUtils/src/resolvers/EndpointResolver.test.ts b/packages/apiUtils/src/resolvers/EndpointResolver.test.ts index b29050bec4..248140de41 100644 --- a/packages/apiUtils/src/resolvers/EndpointResolver.test.ts +++ b/packages/apiUtils/src/resolvers/EndpointResolver.test.ts @@ -3,7 +3,7 @@ import { ApiFormatType } from './ApiResultAdapter'; import axios from 'axios'; import { EndpointResolver } from './EndpointResolver'; import { setupApi } from '../test/setup'; -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { createEndpoint, createEndpointFactory } from './Endpoint'; const MOCK_API_KEY = 'test-api-key'; diff --git a/packages/apiUtils/src/resolvers/EndpointResolver.ts b/packages/apiUtils/src/resolvers/EndpointResolver.ts index 291fe25768..6d9d234831 100644 --- a/packages/apiUtils/src/resolvers/EndpointResolver.ts +++ b/packages/apiUtils/src/resolvers/EndpointResolver.ts @@ -1,4 +1,4 @@ -import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController, CoreConfig } from '@moralisweb3/core'; +import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController, CoreConfig } from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config/ApiUtilsConfig'; import { isNotFoundError } from '../errors/isNotFoundError'; import { ApiResultAdapter } from './ApiResultAdapter'; diff --git a/packages/apiUtils/src/resolvers/Endpoints.ts b/packages/apiUtils/src/resolvers/Endpoints.ts index aab54eb6f8..e67c282bce 100644 --- a/packages/apiUtils/src/resolvers/Endpoints.ts +++ b/packages/apiUtils/src/resolvers/Endpoints.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { Endpoint, EndpointFactory, EndpointMethod } from './Endpoint'; import { EndpointResolver } from './EndpointResolver'; import { PaginatedEndpointFactory, PaginatedParams } from './PaginatedEndpoint'; diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts b/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts index ced9efc2b1..4dafe79607 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core/lib'; +import MoralisCore from '@moralisweb3/common-core'; import { Endpoint, EndpointBodyType } from './Endpoint'; export interface PaginatedParams extends Record { diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts index 0002e403a6..2a92007cdf 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts @@ -10,7 +10,7 @@ import { } from './PaginatedEndpoint'; import { setupApi } from '../test/setup'; import { PaginatedEndpointResolver } from './PaginatedEndpointResolver'; -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; const MOCK_API_KEY = 'test-api-key'; const API_ROOT = 'https://deep-index.moralis.io/api/v2'; diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts index 04bb556a1a..d333943d54 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts @@ -1,7 +1,7 @@ import { tryGetNextPageParams } from '../utils/tryGetNextPageParams'; import { ApiPaginatedResultAdapter } from './ApiPaginatedResultAdapter'; import { ApiUtilsConfig } from '../config/ApiUtilsConfig'; -import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController } from '@moralisweb3/core'; +import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController } from '@moralisweb3/common-core'; import { PaginatedResult, PaginatedEndpoint, PaginatedEndpointFactory, PaginatedParams } from './PaginatedEndpoint'; import { EndpointParamsReader } from './EndpointParamsReader'; diff --git a/packages/apiUtils/src/resolvers/getCommonHeaders.ts b/packages/apiUtils/src/resolvers/getCommonHeaders.ts index 4e792ee3e5..3af2c411da 100644 --- a/packages/apiUtils/src/resolvers/getCommonHeaders.ts +++ b/packages/apiUtils/src/resolvers/getCommonHeaders.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; export type Headers = { [key: string]: string }; diff --git a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts index 3f3a8ac138..7da53d9c9c 100644 --- a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts +++ b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts @@ -1,4 +1,4 @@ -import MoralisCore, { Operation, OperationRequestPropertiesBody } from '@moralisweb3/core'; +import MoralisCore, { Operation, OperationRequestPropertiesBody } from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config'; import { OperationRequestBuilder } from './OperationRequestBuilder'; diff --git a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts index 99e9416a66..e97d91ba7c 100644 --- a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts +++ b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts @@ -5,7 +5,7 @@ import MoralisCore, { OperationRequestBody, OperationRequestPropertiesBody, OperationRequestRawBody, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config'; import { getCommonHeaders } from '../resolvers/getCommonHeaders'; diff --git a/packages/apiUtils/src/resolvers2/OperationResolver.ts b/packages/apiUtils/src/resolvers2/OperationResolver.ts index c329391972..8b8adb85a5 100644 --- a/packages/apiUtils/src/resolvers2/OperationResolver.ts +++ b/packages/apiUtils/src/resolvers2/OperationResolver.ts @@ -5,7 +5,7 @@ import MoralisCore, { Operation, OperationRequestBody, OperationRequestValidator, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { isNotFoundError } from '../errors/isNotFoundError'; import { OperationRequestBuilder } from './OperationRequestBuilder'; import { ResponseAdapter } from './ResponseAdapter'; diff --git a/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts b/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts index 94e4582916..4d3d9b1b8f 100644 --- a/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts +++ b/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts @@ -4,7 +4,7 @@ import MoralisCore, { RequestController, PaginatedJSONResponse, PaginatedOperation, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { OperationRequestBuilder } from './OperationRequestBuilder'; import { PaginatedResponseAdapter } from './PaginatedResponseAdapter'; import { Pagination, readPagination } from './Pagination'; diff --git a/packages/apiUtils/src/resolvers2/PaginatedResponseAdapter.ts b/packages/apiUtils/src/resolvers2/PaginatedResponseAdapter.ts index 2272203096..8170071d39 100644 --- a/packages/apiUtils/src/resolvers2/PaginatedResponseAdapter.ts +++ b/packages/apiUtils/src/resolvers2/PaginatedResponseAdapter.ts @@ -1,4 +1,4 @@ -import { ApiErrorCode, MoralisApiError, PaginatedJSONResponse } from '@moralisweb3/core'; +import { ApiErrorCode, MoralisApiError, PaginatedJSONResponse } from '@moralisweb3/common-core'; import { Pagination } from './Pagination'; export class PaginatedResponseAdapter { diff --git a/packages/apiUtils/src/resolvers2/Pagination.ts b/packages/apiUtils/src/resolvers2/Pagination.ts index 9f27096471..3301a081b2 100644 --- a/packages/apiUtils/src/resolvers2/Pagination.ts +++ b/packages/apiUtils/src/resolvers2/Pagination.ts @@ -1,4 +1,4 @@ -import { PaginatedJSONResponse } from '@moralisweb3/core'; +import { PaginatedJSONResponse } from '@moralisweb3/common-core'; export interface Pagination { total: number; diff --git a/packages/apiUtils/src/test/setup.ts b/packages/apiUtils/src/test/setup.ts index 61abf42e7b..9fd096cb4c 100644 --- a/packages/apiUtils/src/test/setup.ts +++ b/packages/apiUtils/src/test/setup.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { ApiUtils } from '../ApiUtils'; diff --git a/packages/apiUtils/src/utils/tryGetNextPageParams.ts b/packages/apiUtils/src/utils/tryGetNextPageParams.ts index 10618f0939..2972b22aa9 100644 --- a/packages/apiUtils/src/utils/tryGetNextPageParams.ts +++ b/packages/apiUtils/src/utils/tryGetNextPageParams.ts @@ -1,4 +1,4 @@ -import { ApiErrorCode, MoralisApiError } from '@moralisweb3/core'; +import { ApiErrorCode, MoralisApiError } from '@moralisweb3/common-core'; import { PaginatedParams, PaginatedResult } from '../resolvers/PaginatedEndpoint'; export const tryGetNextPageParams = ( diff --git a/packages/auth/integration/setup.ts b/packages/auth/integration/setup.ts index 1d2abf2135..8ebda680ef 100644 --- a/packages/auth/integration/setup.ts +++ b/packages/auth/integration/setup.ts @@ -1,7 +1,7 @@ import { ApiUtils } from '@moralisweb3/api-utils'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { MoralisAuth } from '../src/MoralisAuth'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; diff --git a/packages/auth/package.json b/packages/auth/package.json index c2b2028816..394b5482d7 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@moralisweb3/api-utils": "^2.6.7", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@moralisweb3/common-evm-utils": "^2.6.7", "@moralisweb3/common-sol-utils": "^2.6.7" } diff --git a/packages/auth/src/MoralisAuth.ts b/packages/auth/src/MoralisAuth.ts index 7ed946c5f9..1921a9f68b 100644 --- a/packages/auth/src/MoralisAuth.ts +++ b/packages/auth/src/MoralisAuth.ts @@ -1,4 +1,4 @@ -import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { makeRequestMessage, RequestMessageOptions } from './methods/requestMessage'; import { makeVerify, diff --git a/packages/auth/src/methods/requestMessage.ts b/packages/auth/src/methods/requestMessage.ts index c267bb4b57..4a36dededb 100644 --- a/packages/auth/src/methods/requestMessage.ts +++ b/packages/auth/src/methods/requestMessage.ts @@ -1,6 +1,6 @@ import { SolAddressish, SolNetworkish, SolAddress, SolNetwork } from '@moralisweb3/common-sol-utils'; import { EndpointResolver } from '@moralisweb3/api-utils'; -import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/core'; +import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '@moralisweb3/common-evm-utils'; import { BASE_URL } from '../MoralisAuth'; import { initializeChallengeEvm, initializeChallengeSol } from '../resolvers'; diff --git a/packages/auth/src/methods/verify.ts b/packages/auth/src/methods/verify.ts index 58b286d84a..a0a8c2595a 100644 --- a/packages/auth/src/methods/verify.ts +++ b/packages/auth/src/methods/verify.ts @@ -1,5 +1,5 @@ import { EndpointResolver } from '@moralisweb3/api-utils'; -import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/core'; +import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; import { BASE_URL } from '../MoralisAuth'; import { completeChallengeEvm, completeChallengeSol } from '../resolvers'; import { AuthNetworkType } from '../utils/AuthNetworkType'; diff --git a/packages/auth/src/resolvers/evmRequestChallenge.ts b/packages/auth/src/resolvers/evmRequestChallenge.ts index f11f456534..a0f1074d50 100644 --- a/packages/auth/src/resolvers/evmRequestChallenge.ts +++ b/packages/auth/src/resolvers/evmRequestChallenge.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { toCamelCase } from '@moralisweb3/core'; +import { toCamelCase } from '@moralisweb3/common-core'; import { operations } from '../generated/types'; const name = 'requestChallengeEvm'; diff --git a/packages/auth/src/resolvers/evmVerifyChallenge.ts b/packages/auth/src/resolvers/evmVerifyChallenge.ts index e49a1cf697..0670e87088 100644 --- a/packages/auth/src/resolvers/evmVerifyChallenge.ts +++ b/packages/auth/src/resolvers/evmVerifyChallenge.ts @@ -1,4 +1,4 @@ -import { maybe, toCamelCase } from '@moralisweb3/core'; +import { maybe, toCamelCase } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; import { operations } from '../generated/types'; diff --git a/packages/auth/src/resolvers/solRequestChallenge.ts b/packages/auth/src/resolvers/solRequestChallenge.ts index 04ebb764a1..44357d4d8f 100644 --- a/packages/auth/src/resolvers/solRequestChallenge.ts +++ b/packages/auth/src/resolvers/solRequestChallenge.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { toCamelCase } from '@moralisweb3/core'; +import { toCamelCase } from '@moralisweb3/common-core'; import { operations } from '../generated/types'; const name = 'requestChallengeSolana'; diff --git a/packages/auth/src/resolvers/solVerifyChallenge.ts b/packages/auth/src/resolvers/solVerifyChallenge.ts index 94b7a61992..78446abd65 100644 --- a/packages/auth/src/resolvers/solVerifyChallenge.ts +++ b/packages/auth/src/resolvers/solVerifyChallenge.ts @@ -1,5 +1,5 @@ import { SolNetwork, SolAddress } from '@moralisweb3/common-sol-utils'; -import { maybe, toCamelCase } from '@moralisweb3/core'; +import { maybe, toCamelCase } from '@moralisweb3/common-core'; import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; import { operations } from '../generated/types'; diff --git a/packages/core/.eslintrc.js b/packages/common/core/.eslintrc.js similarity index 100% rename from packages/core/.eslintrc.js rename to packages/common/core/.eslintrc.js diff --git a/packages/core/.gitignore b/packages/common/core/.gitignore similarity index 100% rename from packages/core/.gitignore rename to packages/common/core/.gitignore diff --git a/packages/core/CHANGELOG.md b/packages/common/core/CHANGELOG.md similarity index 99% rename from packages/core/CHANGELOG.md rename to packages/common/core/CHANGELOG.md index 8a8a06d309..4eac50b219 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/common/core/CHANGELOG.md @@ -357,7 +357,7 @@ 2. Install the specific packages that you want. For example `npm install @moralisweb3/evm` or `yarn add @moralisweb3/evm` 3. Register the installed package to the Core module, at the top of your code, before any interaction with Moralis: ```javascript - import Core from '@moralisweb3/core'; + import Core from '@moralisweb3/common-core'; import Evm from '@moralisweb3/evm'; ``` diff --git a/packages/core/README.md b/packages/common/core/README.md similarity index 94% rename from packages/core/README.md rename to packages/common/core/README.md index d2622e38e1..39aa2e6b15 100644 --- a/packages/core/README.md +++ b/packages/common/core/README.md @@ -1,6 +1,6 @@ -# @moralisweb3/core +# @moralisweb3/common-core -The `@moralisweb3/core` should be used in _every_ application that uses Moralis. It is already included if you install the unbrella package `moralis`. +The `@moralisweb3/common-core` should be used in _every_ application that uses Moralis. It is already included if you install the unbrella package `moralis`. The core responsibilities of this package are @@ -13,7 +13,7 @@ The core responsibilities of this package are # Table of contents -- [@moralisweb3/core](#moraliscore) +- [@moralisweb3/common-core](#moraliscore) - [Table of contents](#table-of-contents) - [Modules](#modules) - [Registering modules via `registerModules()`](#registering-modules-via-registermodules) @@ -40,7 +40,7 @@ You can do this by using the `registerModules()` function. This should be done * _Example when using Moralis with the evm network, evm api and server_ ```js -import * as Core from '@moralisweb3/core'; +import * as Core from '@moralisweb3/common-core'; import EvmApi from '@moralisweb3/evm-api'; Core.registerModules([EvmApi]); @@ -53,7 +53,7 @@ You can start every package separately via a `start()` function. But easier is t You can provide a configuration object (see [Config](#config)). Some config options are required, depending on what packages you have registered (for example you will need a `apiKey` for any api package). ```js -import * as Core from '@moralisweb3/core'; +import * as Core from '@moralisweb3/common-core'; Core.start({ apiKey: '', diff --git a/packages/core/integration/test/requestControllerDelete.test.ts b/packages/common/core/integration/test/requestControllerDelete.test.ts similarity index 100% rename from packages/core/integration/test/requestControllerDelete.test.ts rename to packages/common/core/integration/test/requestControllerDelete.test.ts diff --git a/packages/core/integration/test/requestControllerGet.test.ts b/packages/common/core/integration/test/requestControllerGet.test.ts similarity index 100% rename from packages/core/integration/test/requestControllerGet.test.ts rename to packages/common/core/integration/test/requestControllerGet.test.ts diff --git a/packages/core/integration/test/requestControllerPost.test.ts b/packages/common/core/integration/test/requestControllerPost.test.ts similarity index 100% rename from packages/core/integration/test/requestControllerPost.test.ts rename to packages/common/core/integration/test/requestControllerPost.test.ts diff --git a/packages/core/integration/test/requestControllerPut.test.ts b/packages/common/core/integration/test/requestControllerPut.test.ts similarity index 100% rename from packages/core/integration/test/requestControllerPut.test.ts rename to packages/common/core/integration/test/requestControllerPut.test.ts diff --git a/packages/core/jest.config.js b/packages/common/core/jest.config.js similarity index 60% rename from packages/core/jest.config.js rename to packages/common/core/jest.config.js index 1c13fbaa33..dd8e195ea5 100644 --- a/packages/core/jest.config.js +++ b/packages/common/core/jest.config.js @@ -1,4 +1,4 @@ /* eslint-disable global-require */ module.exports = { - ...require('../../jest.config'), + ...require('../../../jest.config'), }; diff --git a/packages/core/package.json b/packages/common/core/package.json similarity index 96% rename from packages/core/package.json rename to packages/common/core/package.json index 2f500649c6..d808ea67a5 100644 --- a/packages/core/package.json +++ b/packages/common/core/package.json @@ -1,5 +1,5 @@ { - "name": "@moralisweb3/core", + "name": "@moralisweb3/common-core", "author": "Moralis", "version": "2.6.7", "license": "MIT", diff --git a/packages/core/src/Assert/assertUnreachable.test.ts b/packages/common/core/src/Assert/assertUnreachable.test.ts similarity index 100% rename from packages/core/src/Assert/assertUnreachable.test.ts rename to packages/common/core/src/Assert/assertUnreachable.test.ts diff --git a/packages/core/src/Assert/assertUnreachable.ts b/packages/common/core/src/Assert/assertUnreachable.ts similarity index 100% rename from packages/core/src/Assert/assertUnreachable.ts rename to packages/common/core/src/Assert/assertUnreachable.ts diff --git a/packages/core/src/Assert/index.ts b/packages/common/core/src/Assert/index.ts similarity index 100% rename from packages/core/src/Assert/index.ts rename to packages/common/core/src/Assert/index.ts diff --git a/packages/core/src/Config/Config.test.ts b/packages/common/core/src/Config/Config.test.ts similarity index 100% rename from packages/core/src/Config/Config.test.ts rename to packages/common/core/src/Config/Config.test.ts diff --git a/packages/core/src/Config/Config.ts b/packages/common/core/src/Config/Config.ts similarity index 100% rename from packages/core/src/Config/Config.ts rename to packages/common/core/src/Config/Config.ts diff --git a/packages/core/src/Config/CoreConfig.test.ts b/packages/common/core/src/Config/CoreConfig.test.ts similarity index 100% rename from packages/core/src/Config/CoreConfig.test.ts rename to packages/common/core/src/Config/CoreConfig.test.ts diff --git a/packages/core/src/Config/CoreConfig.ts b/packages/common/core/src/Config/CoreConfig.ts similarity index 100% rename from packages/core/src/Config/CoreConfig.ts rename to packages/common/core/src/Config/CoreConfig.ts diff --git a/packages/core/src/Config/CoreConfigSetup.ts b/packages/common/core/src/Config/CoreConfigSetup.ts similarity index 100% rename from packages/core/src/Config/CoreConfigSetup.ts rename to packages/common/core/src/Config/CoreConfigSetup.ts diff --git a/packages/core/src/Config/CoreConfigValidator.ts b/packages/common/core/src/Config/CoreConfigValidator.ts similarity index 100% rename from packages/core/src/Config/CoreConfigValidator.ts rename to packages/common/core/src/Config/CoreConfigValidator.ts diff --git a/packages/core/src/Config/MoralisConfig.ts b/packages/common/core/src/Config/MoralisConfig.ts similarity index 97% rename from packages/core/src/Config/MoralisConfig.ts rename to packages/common/core/src/Config/MoralisConfig.ts index 98495e2de3..bdeb52f6c3 100644 --- a/packages/core/src/Config/MoralisConfig.ts +++ b/packages/common/core/src/Config/MoralisConfig.ts @@ -2,7 +2,7 @@ import { SolNetworkish } from './interfaces'; import { CoreConfig, EvmAddressFormat, EvmChainIdFormat } from './CoreConfig'; import { EvmChainish } from './interfaces/EvmChainish'; -// @moralisweb3/core +// @moralisweb3/common-core type CoreConfigType = typeof CoreConfig; type CoreConfigValues = Omit<{ [Key in keyof CoreConfigType]: CoreConfigType[Key]['defaultValue'] }, 'product'>; diff --git a/packages/core/src/Config/index.ts b/packages/common/core/src/Config/index.ts similarity index 100% rename from packages/core/src/Config/index.ts rename to packages/common/core/src/Config/index.ts diff --git a/packages/core/src/Config/interfaces/EvmChainish.ts b/packages/common/core/src/Config/interfaces/EvmChainish.ts similarity index 100% rename from packages/core/src/Config/interfaces/EvmChainish.ts rename to packages/common/core/src/Config/interfaces/EvmChainish.ts diff --git a/packages/core/src/Config/interfaces/SolNetworkish.ts b/packages/common/core/src/Config/interfaces/SolNetworkish.ts similarity index 100% rename from packages/core/src/Config/interfaces/SolNetworkish.ts rename to packages/common/core/src/Config/interfaces/SolNetworkish.ts diff --git a/packages/core/src/Config/interfaces/index.ts b/packages/common/core/src/Config/interfaces/index.ts similarity index 100% rename from packages/core/src/Config/interfaces/index.ts rename to packages/common/core/src/Config/interfaces/index.ts diff --git a/packages/core/src/Error/ErrorCode.ts b/packages/common/core/src/Error/ErrorCode.ts similarity index 100% rename from packages/core/src/Error/ErrorCode.ts rename to packages/common/core/src/Error/ErrorCode.ts diff --git a/packages/core/src/Error/MoralisError.test.ts b/packages/common/core/src/Error/MoralisError.test.ts similarity index 100% rename from packages/core/src/Error/MoralisError.test.ts rename to packages/common/core/src/Error/MoralisError.test.ts diff --git a/packages/core/src/Error/MoralisError.ts b/packages/common/core/src/Error/MoralisError.ts similarity index 100% rename from packages/core/src/Error/MoralisError.ts rename to packages/common/core/src/Error/MoralisError.ts diff --git a/packages/core/src/Error/index.ts b/packages/common/core/src/Error/index.ts similarity index 100% rename from packages/core/src/Error/index.ts rename to packages/common/core/src/Error/index.ts diff --git a/packages/core/src/Error/isMoralisError.test.ts b/packages/common/core/src/Error/isMoralisError.test.ts similarity index 100% rename from packages/core/src/Error/isMoralisError.test.ts rename to packages/common/core/src/Error/isMoralisError.test.ts diff --git a/packages/core/src/Error/isMoralisError.ts b/packages/common/core/src/Error/isMoralisError.ts similarity index 100% rename from packages/core/src/Error/isMoralisError.ts rename to packages/common/core/src/Error/isMoralisError.ts diff --git a/packages/core/src/Modules/ApiModule.ts b/packages/common/core/src/Modules/ApiModule.ts similarity index 100% rename from packages/core/src/Modules/ApiModule.ts rename to packages/common/core/src/Modules/ApiModule.ts diff --git a/packages/core/src/Modules/Module.test.ts b/packages/common/core/src/Modules/Module.test.ts similarity index 100% rename from packages/core/src/Modules/Module.test.ts rename to packages/common/core/src/Modules/Module.test.ts diff --git a/packages/core/src/Modules/Module.ts b/packages/common/core/src/Modules/Module.ts similarity index 100% rename from packages/core/src/Modules/Module.ts rename to packages/common/core/src/Modules/Module.ts diff --git a/packages/core/src/Modules/ModuleName.ts b/packages/common/core/src/Modules/ModuleName.ts similarity index 100% rename from packages/core/src/Modules/ModuleName.ts rename to packages/common/core/src/Modules/ModuleName.ts diff --git a/packages/core/src/Modules/ModuleType.ts b/packages/common/core/src/Modules/ModuleType.ts similarity index 100% rename from packages/core/src/Modules/ModuleType.ts rename to packages/common/core/src/Modules/ModuleType.ts diff --git a/packages/core/src/Modules/Modules.test.ts b/packages/common/core/src/Modules/Modules.test.ts similarity index 100% rename from packages/core/src/Modules/Modules.test.ts rename to packages/common/core/src/Modules/Modules.test.ts diff --git a/packages/core/src/Modules/Modules.ts b/packages/common/core/src/Modules/Modules.ts similarity index 100% rename from packages/core/src/Modules/Modules.ts rename to packages/common/core/src/Modules/Modules.ts diff --git a/packages/core/src/Modules/index.ts b/packages/common/core/src/Modules/index.ts similarity index 100% rename from packages/core/src/Modules/index.ts rename to packages/common/core/src/Modules/index.ts diff --git a/packages/core/src/Modules/types.ts b/packages/common/core/src/Modules/types.ts similarity index 100% rename from packages/core/src/Modules/types.ts rename to packages/common/core/src/Modules/types.ts diff --git a/packages/core/src/Modules/utils.ts b/packages/common/core/src/Modules/utils.ts similarity index 100% rename from packages/core/src/Modules/utils.ts rename to packages/common/core/src/Modules/utils.ts diff --git a/packages/core/src/MoralisCore.ts b/packages/common/core/src/MoralisCore.ts similarity index 100% rename from packages/core/src/MoralisCore.ts rename to packages/common/core/src/MoralisCore.ts diff --git a/packages/core/src/MoralisCoreProvider.ts b/packages/common/core/src/MoralisCoreProvider.ts similarity index 100% rename from packages/core/src/MoralisCoreProvider.ts rename to packages/common/core/src/MoralisCoreProvider.ts diff --git a/packages/core/src/controllers/AxiosRetry.test.ts b/packages/common/core/src/controllers/AxiosRetry.test.ts similarity index 100% rename from packages/core/src/controllers/AxiosRetry.test.ts rename to packages/common/core/src/controllers/AxiosRetry.test.ts diff --git a/packages/core/src/controllers/AxiosRetry.ts b/packages/common/core/src/controllers/AxiosRetry.ts similarity index 100% rename from packages/core/src/controllers/AxiosRetry.ts rename to packages/common/core/src/controllers/AxiosRetry.ts diff --git a/packages/core/src/controllers/LoggerController.test.ts b/packages/common/core/src/controllers/LoggerController.test.ts similarity index 100% rename from packages/core/src/controllers/LoggerController.test.ts rename to packages/common/core/src/controllers/LoggerController.test.ts diff --git a/packages/core/src/controllers/LoggerController.ts b/packages/common/core/src/controllers/LoggerController.ts similarity index 100% rename from packages/core/src/controllers/LoggerController.ts rename to packages/common/core/src/controllers/LoggerController.ts diff --git a/packages/core/src/controllers/RequestController/ApiRequestError.ts b/packages/common/core/src/controllers/RequestController/ApiRequestError.ts similarity index 100% rename from packages/core/src/controllers/RequestController/ApiRequestError.ts rename to packages/common/core/src/controllers/RequestController/ApiRequestError.ts diff --git a/packages/core/src/controllers/RequestController/RequestController.ts b/packages/common/core/src/controllers/RequestController/RequestController.ts similarity index 100% rename from packages/core/src/controllers/RequestController/RequestController.ts rename to packages/common/core/src/controllers/RequestController/RequestController.ts diff --git a/packages/core/src/controllers/RequestController/index.ts b/packages/common/core/src/controllers/RequestController/index.ts similarity index 100% rename from packages/core/src/controllers/RequestController/index.ts rename to packages/common/core/src/controllers/RequestController/index.ts diff --git a/packages/core/src/controllers/index.ts b/packages/common/core/src/controllers/index.ts similarity index 100% rename from packages/core/src/controllers/index.ts rename to packages/common/core/src/controllers/index.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumber.test.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumber.test.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumber.test.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumber.test.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumber.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumber.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumber.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumber.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumberFormatter.test.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.test.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumberFormatter.test.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.test.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumberFormatter.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumberFormatter.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumberParser.test.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.test.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumberParser.test.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumberParser.test.ts diff --git a/packages/core/src/dataTypes/BigNumber/BigNumberParser.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/BigNumberParser.ts rename to packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts diff --git a/packages/core/src/dataTypes/BigNumber/index.ts b/packages/common/core/src/dataTypes/BigNumber/index.ts similarity index 100% rename from packages/core/src/dataTypes/BigNumber/index.ts rename to packages/common/core/src/dataTypes/BigNumber/index.ts diff --git a/packages/core/src/dataTypes/abstract/MoralisData.ts b/packages/common/core/src/dataTypes/abstract/MoralisData.ts similarity index 100% rename from packages/core/src/dataTypes/abstract/MoralisData.ts rename to packages/common/core/src/dataTypes/abstract/MoralisData.ts diff --git a/packages/core/src/dataTypes/abstract/MoralisObjectData.ts b/packages/common/core/src/dataTypes/abstract/MoralisObjectData.ts similarity index 100% rename from packages/core/src/dataTypes/abstract/MoralisObjectData.ts rename to packages/common/core/src/dataTypes/abstract/MoralisObjectData.ts diff --git a/packages/core/src/dataTypes/abstract/index.ts b/packages/common/core/src/dataTypes/abstract/index.ts similarity index 100% rename from packages/core/src/dataTypes/abstract/index.ts rename to packages/common/core/src/dataTypes/abstract/index.ts diff --git a/packages/core/src/dataTypes/abstract/types.ts b/packages/common/core/src/dataTypes/abstract/types.ts similarity index 100% rename from packages/core/src/dataTypes/abstract/types.ts rename to packages/common/core/src/dataTypes/abstract/types.ts diff --git a/packages/core/src/dataTypes/date.ts b/packages/common/core/src/dataTypes/date.ts similarity index 100% rename from packages/core/src/dataTypes/date.ts rename to packages/common/core/src/dataTypes/date.ts diff --git a/packages/core/src/dataTypes/index.ts b/packages/common/core/src/dataTypes/index.ts similarity index 100% rename from packages/core/src/dataTypes/index.ts rename to packages/common/core/src/dataTypes/index.ts diff --git a/packages/core/src/environment/isTest.test.ts b/packages/common/core/src/environment/isTest.test.ts similarity index 100% rename from packages/core/src/environment/isTest.test.ts rename to packages/common/core/src/environment/isTest.test.ts diff --git a/packages/core/src/environment/isTest.ts b/packages/common/core/src/environment/isTest.ts similarity index 100% rename from packages/core/src/environment/isTest.ts rename to packages/common/core/src/environment/isTest.ts diff --git a/packages/core/src/index.ts b/packages/common/core/src/index.ts similarity index 100% rename from packages/core/src/index.ts rename to packages/common/core/src/index.ts diff --git a/packages/core/src/operations/Operation.ts b/packages/common/core/src/operations/Operation.ts similarity index 100% rename from packages/core/src/operations/Operation.ts rename to packages/common/core/src/operations/Operation.ts diff --git a/packages/core/src/operations/OperationRequestValidator.test.ts b/packages/common/core/src/operations/OperationRequestValidator.test.ts similarity index 100% rename from packages/core/src/operations/OperationRequestValidator.test.ts rename to packages/common/core/src/operations/OperationRequestValidator.test.ts diff --git a/packages/core/src/operations/OperationRequestValidator.ts b/packages/common/core/src/operations/OperationRequestValidator.ts similarity index 100% rename from packages/core/src/operations/OperationRequestValidator.ts rename to packages/common/core/src/operations/OperationRequestValidator.ts diff --git a/packages/core/src/operations/PaginatedOperation.ts b/packages/common/core/src/operations/PaginatedOperation.ts similarity index 100% rename from packages/core/src/operations/PaginatedOperation.ts rename to packages/common/core/src/operations/PaginatedOperation.ts diff --git a/packages/core/src/operations/index.ts b/packages/common/core/src/operations/index.ts similarity index 100% rename from packages/core/src/operations/index.ts rename to packages/common/core/src/operations/index.ts diff --git a/packages/core/src/test/MoralisData.test.ts b/packages/common/core/src/test/MoralisData.test.ts similarity index 100% rename from packages/core/src/test/MoralisData.test.ts rename to packages/common/core/src/test/MoralisData.test.ts diff --git a/packages/core/src/test/MoralisObjectData.test.ts b/packages/common/core/src/test/MoralisObjectData.test.ts similarity index 100% rename from packages/core/src/test/MoralisObjectData.test.ts rename to packages/common/core/src/test/MoralisObjectData.test.ts diff --git a/packages/core/src/utils/index.ts b/packages/common/core/src/utils/index.ts similarity index 100% rename from packages/core/src/utils/index.ts rename to packages/common/core/src/utils/index.ts diff --git a/packages/core/src/utils/maybe.ts b/packages/common/core/src/utils/maybe.ts similarity index 100% rename from packages/core/src/utils/maybe.ts rename to packages/common/core/src/utils/maybe.ts diff --git a/packages/core/src/utils/noop.test.ts b/packages/common/core/src/utils/noop.test.ts similarity index 100% rename from packages/core/src/utils/noop.test.ts rename to packages/common/core/src/utils/noop.test.ts diff --git a/packages/core/src/utils/noop.ts b/packages/common/core/src/utils/noop.ts similarity index 100% rename from packages/core/src/utils/noop.ts rename to packages/common/core/src/utils/noop.ts diff --git a/packages/core/src/utils/toCamelCase.ts b/packages/common/core/src/utils/toCamelCase.ts similarity index 100% rename from packages/core/src/utils/toCamelCase.ts rename to packages/common/core/src/utils/toCamelCase.ts diff --git a/packages/core/tsconfig.build.json b/packages/common/core/tsconfig.build.json similarity index 100% rename from packages/core/tsconfig.build.json rename to packages/common/core/tsconfig.build.json diff --git a/packages/core/tsconfig.json b/packages/common/core/tsconfig.json similarity index 65% rename from packages/core/tsconfig.json rename to packages/common/core/tsconfig.json index 5eead2575d..ad5abb3998 100644 --- a/packages/core/tsconfig.json +++ b/packages/common/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.package.json", + "extends": "../../../tsconfig.package.json", "compilerOptions": {}, "include": ["src/**/*", "types/**/*", "integration/**/*"] } diff --git a/packages/common/evmUtils/package.json b/packages/common/evmUtils/package.json index 639c847c02..aa01248ee5 100644 --- a/packages/common/evmUtils/package.json +++ b/packages/common/evmUtils/package.json @@ -28,6 +28,6 @@ "dependencies": { "@ethersproject/address": "^5.6.0", "@ethersproject/transactions": "^5.6.0", - "@moralisweb3/core": "^2.6.7" + "@moralisweb3/common-core": "^2.6.7" } } diff --git a/packages/common/evmUtils/src/CommonEvmUtils.ts b/packages/common/evmUtils/src/CommonEvmUtils.ts index 6e2b9728e4..624c8910e5 100644 --- a/packages/common/evmUtils/src/CommonEvmUtils.ts +++ b/packages/common/evmUtils/src/CommonEvmUtils.ts @@ -1,4 +1,4 @@ -import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/core'; +import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfigSetup } from './config/CommonEvmUtilsConfigSetup'; export class CommonEvmUtils extends Module { diff --git a/packages/common/evmUtils/src/EvmChainResolver.ts b/packages/common/evmUtils/src/EvmChainResolver.ts index fad0a1c1de..119580be75 100644 --- a/packages/common/evmUtils/src/EvmChainResolver.ts +++ b/packages/common/evmUtils/src/EvmChainResolver.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from './config/CommonEvmUtilsConfig'; import { EvmChain, EvmChainish } from './dataTypes'; diff --git a/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.test.ts b/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.test.ts index 91ff418604..00700ec590 100644 --- a/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.test.ts +++ b/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.test.ts @@ -1,4 +1,4 @@ -import { Config, ConfigKey, EvmAddressFormat, EvmChainIdFormat } from '@moralisweb3/core'; +import { Config, ConfigKey, EvmAddressFormat, EvmChainIdFormat } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from './CommonEvmUtilsConfig'; import { CommonEvmUtilsConfigSetup } from './CommonEvmUtilsConfigSetup'; diff --git a/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.ts b/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.ts index e5cc5fef6f..c5b6c2d668 100644 --- a/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.ts +++ b/packages/common/evmUtils/src/config/CommonEvmUtilsConfig.ts @@ -1,4 +1,4 @@ -import { ConfigKey, EvmChainIdFormat, EvmAddressFormat } from '@moralisweb3/core'; +import { ConfigKey, EvmChainIdFormat, EvmAddressFormat } from '@moralisweb3/common-core'; import { EvmChainish } from '../dataTypes'; export const CommonEvmUtilsConfig = { diff --git a/packages/common/evmUtils/src/config/CommonEvmUtilsConfigSetup.ts b/packages/common/evmUtils/src/config/CommonEvmUtilsConfigSetup.ts index 73957c4bae..c0d5f2fb89 100644 --- a/packages/common/evmUtils/src/config/CommonEvmUtilsConfigSetup.ts +++ b/packages/common/evmUtils/src/config/CommonEvmUtilsConfigSetup.ts @@ -1,4 +1,4 @@ -import { Config } from '@moralisweb3/core'; +import { Config } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from './CommonEvmUtilsConfig'; export class CommonEvmUtilsConfigSetup { diff --git a/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts b/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts index 446ce26882..651958a44a 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, maybe, MoralisCoreProvider } from '@moralisweb3/core'; +import MoralisCore, { MoralisDataObject, maybe, MoralisCoreProvider } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { Erc20Input, Erc20Data } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/Erc20Transfer/Erc20Transfer.ts b/packages/common/evmUtils/src/dataTypes/Erc20Transfer/Erc20Transfer.ts index 9b5a139480..4b4581189a 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20Transfer/Erc20Transfer.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20Transfer/Erc20Transfer.ts @@ -1,4 +1,4 @@ -import { MoralisDataObject, BigNumber, dateInputToDate } from '@moralisweb3/core'; +import { MoralisDataObject, BigNumber, dateInputToDate } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { Erc20TransferInput, Erc20TransferData } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/Erc20Transfer/types.ts b/packages/common/evmUtils/src/dataTypes/Erc20Transfer/types.ts index 48487d77d4..8241ea212e 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20Transfer/types.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20Transfer/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; diff --git a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.test.ts b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.test.ts index 901167a30d..40d98ad247 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.test.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@moralisweb3/core'; +import { BigNumber } from '@moralisweb3/common-core'; import { setupEvmUtils } from '../../test/setup'; import { Erc20Token } from '../Erc20/Erc20'; import { Erc20Value } from './Erc20Value'; diff --git a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts index 57ffd16090..1d237bf7fb 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/common-core'; import { Erc20Token, Erc20Tokenish } from '../Erc20/Erc20'; const EVM_ERC20_DEFAULT_DECIMALS = 18; diff --git a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts index 1264c03863..e0da4c8603 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { EvmAddress } from './EvmAddress'; import { setupEvmUtils } from '../../test/setup'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts index ff6a9cadaa..8a825d31ef 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts @@ -6,7 +6,7 @@ import { CoreErrorCode, MoralisCoreError, MoralisData, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { getAddress, isAddress } from '@ethersproject/address'; import { CommonEvmUtilsConfig } from '../../config/CommonEvmUtilsConfig'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts index 3f18ac9963..1042bc30d1 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/core'; +import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmTransaction } from '../EvmTransaction'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts index 5c3bc34aba..006a212aaa 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/core'; +import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/common-core'; import { EvmChain } from '../EvmChain'; import { EvmBlockish } from './EvmBlock'; import { EvmSimpleBlockInput, EvmSimpleBlockData } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/types.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/types.ts index e306954eb9..0e683bc638 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; import { EvmTransaction, EvmTransactionish } from '../EvmTransaction'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts index 6aeb6d88e4..e1245fe2f0 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { setupEvmUtils } from '../../test/setup'; import { EvmChain } from './EvmChain'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts index ab0eaa3b53..69faf36044 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts @@ -9,7 +9,7 @@ import { assertUnreachable, MoralisCore, EvmChainable, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from '../../config/CommonEvmUtilsConfig'; /** diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts index 5d567e091f..370217ab75 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts @@ -1,4 +1,4 @@ -import { CoreErrorCode, MoralisCoreError } from '@moralisweb3/core'; +import { CoreErrorCode, MoralisCoreError } from '@moralisweb3/common-core'; import { InputChainId } from './EvmChainish'; const INVALID_VALUES = ['0x', '0x0', '0', 0]; diff --git a/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts b/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts index 05eebdc19d..0a158de060 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts @@ -5,7 +5,7 @@ import { BigNumber, dateInputToDate, MoralisCoreProvider, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmEvent/types.ts b/packages/common/evmUtils/src/dataTypes/EvmEvent/types.ts index ab357adb70..0e785ddca4 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmEvent/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmEvent/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; import { EvmNativeish, EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts b/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts index 0c084281b3..2a8f005fad 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/common-core'; /** * Type containing valid EVM native units diff --git a/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts b/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts index 531a2c24ed..d150dd2285 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts @@ -7,7 +7,7 @@ import MoralisCore, { BigNumber, dateInputToDate, MoralisCoreProvider, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNftData, EvmNftInput } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNft/types.ts b/packages/common/evmUtils/src/dataTypes/EvmNft/types.ts index c6ada8b94c..d37e2efb91 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNft/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNft/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput, MoralisDataObjectValue } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput, MoralisDataObjectValue } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts index 3344f228f4..a638945c5a 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { EvmNftCollection } from './EvmNftCollection'; import { setupEvmUtils } from '../../test/setup'; import { EvmNftCollectionInput } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts index 82da5e13bf..f518af0cdf 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, MoralisCoreProvider, maybe } from '@moralisweb3/core'; +import MoralisCore, { MoralisDataObject, MoralisCoreProvider, maybe } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNftCollectionData, EvmNftCollectionInput } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/EvmNftMetadata.ts b/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/EvmNftMetadata.ts index 0baecddf06..195f20f2cf 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/EvmNftMetadata.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/EvmNftMetadata.ts @@ -1,4 +1,4 @@ -import { MoralisDataObject, maybe, dateInputToDate } from '@moralisweb3/core'; +import { MoralisDataObject, maybe, dateInputToDate } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNftMetadataInput, EvmNftMetadataData } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/types.ts b/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/types.ts index d8ff1c9e38..01831b9df0 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftMetadata/types.ts @@ -1,4 +1,4 @@ -import { DateInput } from '@moralisweb3/core'; +import { DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftTrade/EvmNftTrade.ts b/packages/common/evmUtils/src/dataTypes/EvmNftTrade/EvmNftTrade.ts index 869f06118e..587f094168 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftTrade/EvmNftTrade.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftTrade/EvmNftTrade.ts @@ -1,4 +1,4 @@ -import { MoralisDataObject, maybe, BigNumber, dateInputToDate } from '@moralisweb3/core'; +import { MoralisDataObject, maybe, BigNumber, dateInputToDate } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftTrade/types.ts b/packages/common/evmUtils/src/dataTypes/EvmNftTrade/types.ts index 929a9c24b7..957d52dcf7 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftTrade/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftTrade/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; import { EvmNativeish, EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts index 4d5a532502..4afa000478 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts @@ -4,7 +4,7 @@ import MoralisCore, { MoralisCoreProvider, BigNumber, dateInputToDate, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/types.ts b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/types.ts index 8c6b29234a..424b2f3d5a 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; import { EvmNativeish, EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts index c83edbe835..8a554216bf 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { EvmSignature, EvmSignatureish } from './EvmSignature'; import { setupEvmUtils } from '../../test/setup'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.ts b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.ts index 400292c771..8dd2247784 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.ts @@ -1,4 +1,4 @@ -import { BigNumber, MoralisDataObject, MoralisDataObjectValue } from '@moralisweb3/core'; +import { BigNumber, MoralisDataObject, MoralisDataObjectValue } from '@moralisweb3/common-core'; import { splitSignature, joinSignature, Signature as EthersSignature, hexlify } from '@ethersproject/bytes'; import { EvmSignatureInput } from './types'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts b/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts index 68eba29094..e47d2069f1 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts @@ -4,7 +4,7 @@ import MoralisCore, { BigNumber, MoralisCoreProvider, dateInputToDate, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmTransaction/types.ts b/packages/common/evmUtils/src/dataTypes/EvmTransaction/types.ts index 5eb811ea38..3760395d1c 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmTransaction/types.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmTransaction/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/core'; +import { BigNumber, BigNumberish, DateInput } from '@moralisweb3/common-core'; import { EvmAddressish, EvmAddress } from '../EvmAddress'; import { EvmChain, EvmChainish } from '../EvmChain'; import { EvmNativeish, EvmNative } from '../EvmNative'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts b/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts index 2008443402..872ea7d8b5 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmTransactionLogData, EvmTransactionLogInput } from './types'; diff --git a/packages/common/evmUtils/src/operations/operations.test.ts b/packages/common/evmUtils/src/operations/operations.test.ts index 79501668eb..7f72291fcf 100644 --- a/packages/common/evmUtils/src/operations/operations.test.ts +++ b/packages/common/evmUtils/src/operations/operations.test.ts @@ -1,4 +1,4 @@ -import { toCamel } from '@moralisweb3/core'; +import { toCamel } from '@moralisweb3/common-core'; import { OpenApiInterfaceReader } from '@moralisweb3/test-utils'; import { operations } from './operations'; diff --git a/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts b/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts index 40af245f81..01d69e9a5a 100644 --- a/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts +++ b/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, PaginatedOperation, toCamelCase, BigNumber, maybe } from '@moralisweb3/core'; +import { MoralisCore, Camelize, PaginatedOperation, toCamelCase, BigNumber, maybe } from '@moralisweb3/common-core'; import { Erc20Transfer, EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '../../dataTypes'; import { EvmChainResolver } from '../../EvmChainResolver'; import { operations } from '../openapi'; diff --git a/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts b/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts index 046b0f5e23..708bc15e73 100644 --- a/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts +++ b/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '../../dataTypes'; import { EvmChainResolver } from '../../EvmChainResolver'; import { operations } from '../openapi'; diff --git a/packages/common/evmUtils/src/test/setup.ts b/packages/common/evmUtils/src/test/setup.ts index ff78210230..caa5091fbc 100644 --- a/packages/common/evmUtils/src/test/setup.ts +++ b/packages/common/evmUtils/src/test/setup.ts @@ -1,4 +1,4 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '../CommonEvmUtils'; export const setupEvmUtils = () => { diff --git a/packages/common/solUtils/package.json b/packages/common/solUtils/package.json index 860af08b8a..2ab7dbb751 100644 --- a/packages/common/solUtils/package.json +++ b/packages/common/solUtils/package.json @@ -26,7 +26,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@solana/web3.js": "^1.56.2" } } diff --git a/packages/common/solUtils/src/CommonSolUtils.ts b/packages/common/solUtils/src/CommonSolUtils.ts index e4d36dc0cc..b4afb676f1 100644 --- a/packages/common/solUtils/src/CommonSolUtils.ts +++ b/packages/common/solUtils/src/CommonSolUtils.ts @@ -1,4 +1,4 @@ -import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/core'; +import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/common-core'; import { CommonSolUtilsConfigSetup } from './config'; export class CommonSolUtils extends Module { diff --git a/packages/common/solUtils/src/SolNetworkResolver.ts b/packages/common/solUtils/src/SolNetworkResolver.ts index 66d26c74b7..237a2110c0 100644 --- a/packages/common/solUtils/src/SolNetworkResolver.ts +++ b/packages/common/solUtils/src/SolNetworkResolver.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { CommonSolUtilsConfig } from './config/CommonSolUtilsConfig'; import { SolNetwork, SolNetworkish, SolNetworkName } from './dataTypes'; diff --git a/packages/common/solUtils/src/config/CommonSolUtilsConfig.ts b/packages/common/solUtils/src/config/CommonSolUtilsConfig.ts index 840aeca8fc..cb2994983d 100644 --- a/packages/common/solUtils/src/config/CommonSolUtilsConfig.ts +++ b/packages/common/solUtils/src/config/CommonSolUtilsConfig.ts @@ -1,4 +1,4 @@ -import { ConfigKey } from '@moralisweb3/core'; +import { ConfigKey } from '@moralisweb3/common-core'; import { SolNetworkish } from '../dataTypes'; export const CommonSolUtilsConfig = { diff --git a/packages/common/solUtils/src/config/CommonSolUtilsConfigSetup.ts b/packages/common/solUtils/src/config/CommonSolUtilsConfigSetup.ts index 03ee86f66b..e9e5a85fec 100644 --- a/packages/common/solUtils/src/config/CommonSolUtilsConfigSetup.ts +++ b/packages/common/solUtils/src/config/CommonSolUtilsConfigSetup.ts @@ -1,4 +1,4 @@ -import { Config } from '@moralisweb3/core'; +import { Config } from '@moralisweb3/common-core'; import { CommonSolUtilsConfig } from './CommonSolUtilsConfig'; export class CommonSolUtilsConfigSetup { diff --git a/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts b/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts index 289ba672d2..433d5b24a8 100644 --- a/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts +++ b/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts @@ -1,4 +1,4 @@ -import { CoreErrorCode, MoralisCoreError, MoralisData, MoralisDataFormatted } from '@moralisweb3/core'; +import { CoreErrorCode, MoralisCoreError, MoralisData, MoralisDataFormatted } from '@moralisweb3/common-core'; import { PublicKey } from '@solana/web3.js'; /** diff --git a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.test.ts b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.test.ts index e15db0ba97..d06d7e0d67 100644 --- a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.test.ts +++ b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@moralisweb3/core'; +import { BigNumber } from '@moralisweb3/common-core'; import { SolNative, SolNativeish, SolNativeUnit } from './SolNative'; describe('SolNative', () => { diff --git a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts index d056d7c1f2..739fc6909c 100644 --- a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts +++ b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts @@ -5,7 +5,7 @@ import { MoralisCoreError, BigNumberish, BigNumber, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; /** * Type containing valid Solana native units diff --git a/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts b/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts index b05dad850e..c5148436d8 100644 --- a/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts +++ b/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts @@ -1,4 +1,4 @@ -import { MoralisData, MoralisDataFormatted, CoreErrorCode, MoralisCoreError } from '@moralisweb3/core'; +import { MoralisData, MoralisDataFormatted, CoreErrorCode, MoralisCoreError } from '@moralisweb3/common-core'; const solNetworkNames = ['mainnet', 'devnet'] as const; diff --git a/packages/common/solUtils/src/operations/account/getBalanceOperation.ts b/packages/common/solUtils/src/operations/account/getBalanceOperation.ts index b9e28a7d14..cea19a7998 100644 --- a/packages/common/solUtils/src/operations/account/getBalanceOperation.ts +++ b/packages/common/solUtils/src/operations/account/getBalanceOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNative, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/solUtils/src/operations/account/getNFTsOperation.ts b/packages/common/solUtils/src/operations/account/getNFTsOperation.ts index d877c7d107..aef037e16f 100644 --- a/packages/common/solUtils/src/operations/account/getNFTsOperation.ts +++ b/packages/common/solUtils/src/operations/account/getNFTsOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/solUtils/src/operations/account/getPortfolioOperation.ts b/packages/common/solUtils/src/operations/account/getPortfolioOperation.ts index 614c1a0592..bfb0aa7dc8 100644 --- a/packages/common/solUtils/src/operations/account/getPortfolioOperation.ts +++ b/packages/common/solUtils/src/operations/account/getPortfolioOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNative, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/solUtils/src/operations/account/getSPLOperation.ts b/packages/common/solUtils/src/operations/account/getSPLOperation.ts index 31b8ad60d1..6f055d7dd4 100644 --- a/packages/common/solUtils/src/operations/account/getSPLOperation.ts +++ b/packages/common/solUtils/src/operations/account/getSPLOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNative, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/solUtils/src/operations/nft/getNFTMetadataOperation.ts b/packages/common/solUtils/src/operations/nft/getNFTMetadataOperation.ts index c0a26834b6..a7aa04afb3 100644 --- a/packages/common/solUtils/src/operations/nft/getNFTMetadataOperation.ts +++ b/packages/common/solUtils/src/operations/nft/getNFTMetadataOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/solUtils/src/operations/token/getTokenPriceOperation.ts b/packages/common/solUtils/src/operations/token/getTokenPriceOperation.ts index cc128e32ca..ff14594d74 100644 --- a/packages/common/solUtils/src/operations/token/getTokenPriceOperation.ts +++ b/packages/common/solUtils/src/operations/token/getTokenPriceOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/core'; +import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNative, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; diff --git a/packages/common/streamsUtils/package.json b/packages/common/streamsUtils/package.json index e798b639c0..94ecb78556 100644 --- a/packages/common/streamsUtils/package.json +++ b/packages/common/streamsUtils/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "@ethersproject/abi": "^5.7.0", - "@moralisweb3/core": "^2.6.5", + "@moralisweb3/common-core": "^2.6.5", "@moralisweb3/common-evm-utils": "^2.6.5" } } diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.test.ts b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.test.ts index f87d55aed9..df111b91e9 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { EvmStream } from './EvmStream'; import { mockEvmStream } from './EvmStream.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts index 872b6b42bc..61eead15aa 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmChain } from '@moralisweb3/common-evm-utils'; import { EvmStreamData, EvmStreamInput, EvmStreamJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts index 110ff46397..0c43ca3af8 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { EvmStreamResult } from './EvmStreamResult'; import { mockEvmStreamResult } from './EvmStreamResult.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts index 92ab5ecdb2..551bbe7236 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmStreamResultFormatter } from './EvmStreamResultFormatter'; import { EvmStreamResultParser } from './EvmStreamResultParser'; import { EvmStreamResultData, EvmStreamResultInput } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts index 5359d88dc6..7ee1ca50b0 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts @@ -1,5 +1,5 @@ /* eslint-disable etc/no-commented-out-code */ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { EvmSimpleBlock, EvmChain } from '@moralisweb3/common-evm-utils'; import { Block, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts index 1a567d4364..b0e8c269fb 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc1155Approval } from './StreamErc1155Approval'; import { mockStreamErc1155Approval } from './StreamErc1155Approval.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts index c7dbd050fe..01800c9a86 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc1155ApprovalData, StreamErc1155ApprovalInput, StreamErc1155ApprovalJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts index 3122b5cbbe..2c16eb1de9 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc20Approval } from './StreamErc20Approval'; import { mockStreamErc20Approval } from './StreamErc20Approval.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts index 152abd7c54..d9f95b1beb 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc20ApprovalData, StreamErc20ApprovalInput, StreamErc20ApprovalJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/types.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/types.ts index 42bebf7b5b..7868e57584 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/types.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish } from '@moralisweb3/core'; +import { BigNumber, BigNumberish } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish, EvmChain } from '@moralisweb3/common-evm-utils'; export interface StreamErc20ApprovalInput { diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts index eb9918e342..6748ca6563 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc20Transfer } from './StreamErc20Transfer'; import { mockStreamErc20Transfer } from './StreamErc20Transfer.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts index 52da8adeb9..8196eb39e0 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc20TransferData, StreamErc20TransferInput, StreamErc20TransferJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/types.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/types.ts index c73adf2e6b..ab59ff63b7 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/types.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish } from '@moralisweb3/core'; +import { BigNumber, BigNumberish } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish, EvmChain } from '@moralisweb3/common-evm-utils'; export interface StreamErc20TransferInput { diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts index dd017a31b9..9eb92dd837 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc721Approval } from './StreamErc721Approval'; import { mockStreamErc721Approval } from './StreamErc721Approval.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts index 161834be3c..88ed559027 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc721ApprovalData, StreamErc721ApprovalInput, StreamErc721ApprovalJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts index 50eaff48d3..bcddc9f1dc 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmInternalTransaction } from './StreamEvmInternalTransaction'; import { mockStreamEvmInternalTransaction } from './StreamEvmInternalTransaction.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts index 1e71993abf..97b38fc7a3 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmInternalTransactionData, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/types.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/types.ts index e0695df12f..49b277c6bc 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/types.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish } from '@moralisweb3/core'; +import { BigNumber, BigNumberish } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish, EvmChain } from '@moralisweb3/common-evm-utils'; export interface StreamEvmInternalTransactionInput { diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts index 28acc1a65d..645122a382 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmNftTransfer } from './StreamEvmNftTransfer'; import { mockStreamEvmNftTransferInput } from './StreamEvmNftTransfer.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts index 267d4a996b..330c15d912 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmNftTransferData, StreamEvmNftTransferInput, StreamEvmNftTransferJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts index e7c2fd89bc..0492e7daaf 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmTransaction } from './StreamEvmTransaction'; import { mockStreamEvmTransactionInput } from './StreamEvmTransaction.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts index 2cd4a228bc..88a80aa0e8 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain, EvmSignature } from '@moralisweb3/common-evm-utils'; import { StreamEvmTransactionData, StreamEvmTransactionInput, StreamEvmTransactionJSON } from './types'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/types.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/types.ts index 5acc9a0658..5995c28a42 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/types.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/types.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish } from '@moralisweb3/core'; +import { BigNumber, BigNumberish } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish, EvmChain, EvmSignature } from '@moralisweb3/common-evm-utils'; export interface StreamEvmTransactionInput { diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts index 91c8776d9c..d7f88620d7 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/core'; +import MoralisCore from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmTransactionLog } from './StreamEvmTransactionLog'; import { mockStreamEvmTransactionLogInput } from './StreamEvmTransactionLog.mock'; diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts index c9528b0fa2..aec851ebf3 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/core'; +import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmTransactionLogData, StreamEvmTransactionLogInput, StreamEvmTransactionLogJSON } from './types'; diff --git a/packages/common/streamsUtils/src/test/setup.ts b/packages/common/streamsUtils/src/test/setup.ts index f5028a4853..9d64165ab8 100644 --- a/packages/common/streamsUtils/src/test/setup.ts +++ b/packages/common/streamsUtils/src/test/setup.ts @@ -1,4 +1,4 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; export const setupStreamsUtils = () => { diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts new file mode 100644 index 0000000000..1d0dacc954 --- /dev/null +++ b/packages/core/src/version.ts @@ -0,0 +1 @@ +export const LIB_VERSION = "2.6.7"; diff --git a/packages/evmApi/CHANGELOG.md b/packages/evmApi/CHANGELOG.md index 2151b27bba..6c2f07e7e7 100644 --- a/packages/evmApi/CHANGELOG.md +++ b/packages/evmApi/CHANGELOG.md @@ -696,7 +696,7 @@ 2. Install the specific packages that you want. For example `npm install @moralisweb3/evm` or `yarn add @moralisweb3/evm` 3. Register the installed package to the Core module, at the top of your code, before any interaction with Moralis: ```javascript - import Core from '@moralisweb3/core'; + import Core from '@moralisweb3/common-core'; import Evm from '@moralisweb3/evm'; ``` diff --git a/packages/evmApi/integration/setup.ts b/packages/evmApi/integration/setup.ts index e3567ec3c0..0e5134c6d3 100644 --- a/packages/evmApi/integration/setup.ts +++ b/packages/evmApi/integration/setup.ts @@ -1,5 +1,5 @@ import { ApiUtils } from '@moralisweb3/api-utils'; -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { EvmApi } from '../src/EvmApi'; import { MOCK_API_KEY } from './mocks/config'; diff --git a/packages/evmApi/package.json b/packages/evmApi/package.json index f861e26e89..1ab66fa2d8 100644 --- a/packages/evmApi/package.json +++ b/packages/evmApi/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@moralisweb3/api-utils": "^2.6.7", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@moralisweb3/common-evm-utils": "^2.6.7" } } diff --git a/packages/evmApi/src/EvmApi.test.ts b/packages/evmApi/src/EvmApi.test.ts index 72b6fde114..f05bd7fa15 100644 --- a/packages/evmApi/src/EvmApi.test.ts +++ b/packages/evmApi/src/EvmApi.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore, AxiosRetry } from '@moralisweb3/core'; +import { MoralisCore, AxiosRetry } from '@moralisweb3/common-core'; import { ApiUtils, ApiUtilsConfig } from '@moralisweb3/api-utils'; import { EvmApi } from './EvmApi'; diff --git a/packages/evmApi/src/EvmApi.ts b/packages/evmApi/src/EvmApi.ts index d9b7ba1a23..18be81ee62 100644 --- a/packages/evmApi/src/EvmApi.ts +++ b/packages/evmApi/src/EvmApi.ts @@ -5,7 +5,7 @@ import { Operation, PaginatedOperation, PaginatedRequest, -} from '@moralisweb3/core'; +} from '@moralisweb3/common-core'; import { getTokenAllowance, getTokenMetadata, diff --git a/packages/evmApi/src/config/EvmApiConfig.ts b/packages/evmApi/src/config/EvmApiConfig.ts index 2af88ab975..60e37019ed 100644 --- a/packages/evmApi/src/config/EvmApiConfig.ts +++ b/packages/evmApi/src/config/EvmApiConfig.ts @@ -1,4 +1,4 @@ -import { ConfigKey } from '@moralisweb3/core'; +import { ConfigKey } from '@moralisweb3/common-core'; import { EvmChainish } from '@moralisweb3/common-evm-utils'; export const EvmApiConfig = { diff --git a/packages/evmApi/src/config/EvmApiConfigSetup.ts b/packages/evmApi/src/config/EvmApiConfigSetup.ts index 7bff672b3e..cfefad41cd 100644 --- a/packages/evmApi/src/config/EvmApiConfigSetup.ts +++ b/packages/evmApi/src/config/EvmApiConfigSetup.ts @@ -1,4 +1,4 @@ -import { Config } from '@moralisweb3/core'; +import { Config } from '@moralisweb3/common-core'; import { EvmApiConfig } from './EvmApiConfig'; export class EvmApiConfigSetup { diff --git a/packages/evmApi/src/resolvers/EvmChainResolver.ts b/packages/evmApi/src/resolvers/EvmChainResolver.ts index c0188ae963..be934bd7b4 100644 --- a/packages/evmApi/src/resolvers/EvmChainResolver.ts +++ b/packages/evmApi/src/resolvers/EvmChainResolver.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { EvmChain, EvmChainish, EvmChainResolver as CommonEvmChainResolver } from '@moralisweb3/common-evm-utils'; // TODO: we need to remove this class after refactor. diff --git a/packages/evmApi/src/resolvers/balance/getNativeBalance.ts b/packages/evmApi/src/resolvers/balance/getNativeBalance.ts index 1dadaf1e15..5c718ceed4 100644 --- a/packages/evmApi/src/resolvers/balance/getNativeBalance.ts +++ b/packages/evmApi/src/resolvers/balance/getNativeBalance.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmAddressish, EvmChainish, EvmNative, EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/block/getBlock.ts b/packages/evmApi/src/resolvers/block/getBlock.ts index 3e9788bfc5..83fb3aa414 100644 --- a/packages/evmApi/src/resolvers/block/getBlock.ts +++ b/packages/evmApi/src/resolvers/block/getBlock.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import MoralisCore, { Camelize, toCamelCase } from '@moralisweb3/core'; +import MoralisCore, { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmTransaction, EvmTransactionLog, EvmBlock } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/block/getDateToBlock.ts b/packages/evmApi/src/resolvers/block/getDateToBlock.ts index 974f9cb97a..d3c5f57af7 100644 --- a/packages/evmApi/src/resolvers/block/getDateToBlock.ts +++ b/packages/evmApi/src/resolvers/block/getDateToBlock.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { dateInputToDate } from '@moralisweb3/core'; +import { dateInputToDate } from '@moralisweb3/common-core'; import { EvmChainish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/defi/getPairAddress.ts b/packages/evmApi/src/resolvers/defi/getPairAddress.ts index 4b4719f7c7..365ab6720b 100644 --- a/packages/evmApi/src/resolvers/defi/getPairAddress.ts +++ b/packages/evmApi/src/resolvers/defi/getPairAddress.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { Erc20Token, EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/defi/getPairReserves.ts b/packages/evmApi/src/resolvers/defi/getPairReserves.ts index 8ad59d9e17..890ac3f6c3 100644 --- a/packages/evmApi/src/resolvers/defi/getPairReserves.ts +++ b/packages/evmApi/src/resolvers/defi/getPairReserves.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/events/getContractEvents.ts b/packages/evmApi/src/resolvers/events/getContractEvents.ts index 8d0f0ddeda..352a848a15 100644 --- a/packages/evmApi/src/resolvers/events/getContractEvents.ts +++ b/packages/evmApi/src/resolvers/events/getContractEvents.ts @@ -4,7 +4,7 @@ import { PaginatedParams, EndpointBodyType, } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddress, EvmAddressish, EvmEvent } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/events/getContractLogs.ts b/packages/evmApi/src/resolvers/events/getContractLogs.ts index a47a9da6a1..fdadd1cd92 100644 --- a/packages/evmApi/src/resolvers/events/getContractLogs.ts +++ b/packages/evmApi/src/resolvers/events/getContractLogs.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmTransactionLog } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getContractNFTs.ts b/packages/evmApi/src/resolvers/nft/getContractNFTs.ts index 824e120160..b33233ef67 100644 --- a/packages/evmApi/src/resolvers/nft/getContractNFTs.ts +++ b/packages/evmApi/src/resolvers/nft/getContractNFTs.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTContractMetadata.ts b/packages/evmApi/src/resolvers/nft/getNFTContractMetadata.ts index 51a2a1dc4b..853dd2eb52 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTContractMetadata.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTContractMetadata.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { maybe, toCamelCase } from '@moralisweb3/core'; +import { maybe, toCamelCase } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChain, EvmChainish, EvmNftMetadata } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTContractTransfers.ts b/packages/evmApi/src/resolvers/nft/getNFTContractTransfers.ts index 0839389be1..ebaef8bc6c 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTContractTransfers.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTContractTransfers.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNative, EvmNftTransfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTLowestPrice.ts b/packages/evmApi/src/resolvers/nft/getNFTLowestPrice.ts index 0272033d98..dc8f2566a9 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTLowestPrice.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTLowestPrice.ts @@ -1,6 +1,6 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNative, EvmNftTrade } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTMetadata.ts b/packages/evmApi/src/resolvers/nft/getNFTMetadata.ts index 3c6b5a3bb4..107f4d2406 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTMetadata.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTMetadata.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTOwners.ts b/packages/evmApi/src/resolvers/nft/getNFTOwners.ts index f390faba39..de4a956577 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTOwners.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTOwners.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTTokenIdOwners.ts b/packages/evmApi/src/resolvers/nft/getNFTTokenIdOwners.ts index ce7e35e264..9abe022f1d 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTTokenIdOwners.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTTokenIdOwners.ts @@ -1,6 +1,6 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTTrades.ts b/packages/evmApi/src/resolvers/nft/getNFTTrades.ts index a2190701cc..4af2b81b83 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTTrades.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTTrades.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNative, EvmNftTrade } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTTransfers.ts b/packages/evmApi/src/resolvers/nft/getNFTTransfers.ts index fa83fe9376..5fdc919608 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTTransfers.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTTransfers.ts @@ -1,6 +1,6 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNative, EvmNftTransfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTTransfersByBlock.ts b/packages/evmApi/src/resolvers/nft/getNFTTransfersByBlock.ts index 9963de34bc..7cb164270b 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTTransfersByBlock.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTTransfersByBlock.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddress, EvmNative, EvmNftTransfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getNFTTransfersFromToBlock.ts b/packages/evmApi/src/resolvers/nft/getNFTTransfersFromToBlock.ts index b4c35d53dc..6c583cc4f1 100644 --- a/packages/evmApi/src/resolvers/nft/getNFTTransfersFromToBlock.ts +++ b/packages/evmApi/src/resolvers/nft/getNFTTransfersFromToBlock.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddress, EvmNative, EvmNftTransfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/getWalletNFTCollections.ts b/packages/evmApi/src/resolvers/nft/getWalletNFTCollections.ts index b718c12f8b..bc2257c173 100644 --- a/packages/evmApi/src/resolvers/nft/getWalletNFTCollections.ts +++ b/packages/evmApi/src/resolvers/nft/getWalletNFTCollections.ts @@ -1,4 +1,4 @@ -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNftCollection } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; diff --git a/packages/evmApi/src/resolvers/nft/getWalletNFTTransfers.ts b/packages/evmApi/src/resolvers/nft/getWalletNFTTransfers.ts index 35fde85ee7..b578cdc0cd 100644 --- a/packages/evmApi/src/resolvers/nft/getWalletNFTTransfers.ts +++ b/packages/evmApi/src/resolvers/nft/getWalletNFTTransfers.ts @@ -1,4 +1,4 @@ -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNative, EvmNftTransfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; diff --git a/packages/evmApi/src/resolvers/nft/getWalletNFTs.ts b/packages/evmApi/src/resolvers/nft/getWalletNFTs.ts index 0301457439..a3c55250b3 100644 --- a/packages/evmApi/src/resolvers/nft/getWalletNFTs.ts +++ b/packages/evmApi/src/resolvers/nft/getWalletNFTs.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpoint, createPaginatedEndpointFactory, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize, dateInputToDate } from '@moralisweb3/core'; +import { Camelize, dateInputToDate } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/reSyncMetadata.ts b/packages/evmApi/src/resolvers/nft/reSyncMetadata.ts index 77a4d0b77b..d4a4d62829 100644 --- a/packages/evmApi/src/resolvers/nft/reSyncMetadata.ts +++ b/packages/evmApi/src/resolvers/nft/reSyncMetadata.ts @@ -1,6 +1,6 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/searchNFTs.ts b/packages/evmApi/src/resolvers/nft/searchNFTs.ts index 8b236669de..1c285581e5 100644 --- a/packages/evmApi/src/resolvers/nft/searchNFTs.ts +++ b/packages/evmApi/src/resolvers/nft/searchNFTs.ts @@ -1,6 +1,6 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmNft } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/nft/syncNFTContract.ts b/packages/evmApi/src/resolvers/nft/syncNFTContract.ts index 0bcd542601..b64cd6472c 100644 --- a/packages/evmApi/src/resolvers/nft/syncNFTContract.ts +++ b/packages/evmApi/src/resolvers/nft/syncNFTContract.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/resolve/resolveAddress.ts b/packages/evmApi/src/resolvers/resolve/resolveAddress.ts index 505f145604..3c8ce9af47 100644 --- a/packages/evmApi/src/resolvers/resolve/resolveAddress.ts +++ b/packages/evmApi/src/resolvers/resolve/resolveAddress.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; diff --git a/packages/evmApi/src/resolvers/token/getTokenAllowance.ts b/packages/evmApi/src/resolvers/token/getTokenAllowance.ts index 3710fba977..210cb13253 100644 --- a/packages/evmApi/src/resolvers/token/getTokenAllowance.ts +++ b/packages/evmApi/src/resolvers/token/getTokenAllowance.ts @@ -1,4 +1,4 @@ -import { BigNumber, Camelize } from '@moralisweb3/core'; +import { BigNumber, Camelize } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/common-evm-utils'; import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; import { operations } from '../../generated/types'; diff --git a/packages/evmApi/src/resolvers/token/getTokenMetadata.ts b/packages/evmApi/src/resolvers/token/getTokenMetadata.ts index 1fdf51ef97..5305c1fd18 100644 --- a/packages/evmApi/src/resolvers/token/getTokenMetadata.ts +++ b/packages/evmApi/src/resolvers/token/getTokenMetadata.ts @@ -1,6 +1,6 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { Erc20Token, EvmChainish, EvmAddressish, EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/token/getTokenMetadataBySymbol.ts b/packages/evmApi/src/resolvers/token/getTokenMetadataBySymbol.ts index dc4b76c743..28e4f5630c 100644 --- a/packages/evmApi/src/resolvers/token/getTokenMetadataBySymbol.ts +++ b/packages/evmApi/src/resolvers/token/getTokenMetadataBySymbol.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { Erc20Token, EvmChainish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/token/getTokenPrice.ts b/packages/evmApi/src/resolvers/token/getTokenPrice.ts index 076bb2c816..dccc517987 100644 --- a/packages/evmApi/src/resolvers/token/getTokenPrice.ts +++ b/packages/evmApi/src/resolvers/token/getTokenPrice.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize, toCamelCase } from '@moralisweb3/core'; +import { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmNative, EvmAddress, EvmChainish, EvmAddressish } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/token/getTokenTransfers.ts b/packages/evmApi/src/resolvers/token/getTokenTransfers.ts index cf09e07b7c..2235ecdae4 100644 --- a/packages/evmApi/src/resolvers/token/getTokenTransfers.ts +++ b/packages/evmApi/src/resolvers/token/getTokenTransfers.ts @@ -1,5 +1,5 @@ import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; -import { BigNumber, Camelize, toCamelCase } from '@moralisweb3/core'; +import { BigNumber, Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, Erc20Transfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/token/getWalletTokenBalances.ts b/packages/evmApi/src/resolvers/token/getWalletTokenBalances.ts index ac7a6b52ef..6af68293e1 100644 --- a/packages/evmApi/src/resolvers/token/getWalletTokenBalances.ts +++ b/packages/evmApi/src/resolvers/token/getWalletTokenBalances.ts @@ -1,4 +1,4 @@ -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { Erc20Value, EvmAddressish, EvmChainish, EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; diff --git a/packages/evmApi/src/resolvers/token/getWalletTokenTransfers.ts b/packages/evmApi/src/resolvers/token/getWalletTokenTransfers.ts index 2d475706b7..89ac196bd2 100644 --- a/packages/evmApi/src/resolvers/token/getWalletTokenTransfers.ts +++ b/packages/evmApi/src/resolvers/token/getWalletTokenTransfers.ts @@ -1,4 +1,4 @@ -import { BigNumber, Camelize, toCamelCase } from '@moralisweb3/core'; +import { BigNumber, Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, Erc20Transfer } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; diff --git a/packages/evmApi/src/resolvers/transaction/getTransaction.ts b/packages/evmApi/src/resolvers/transaction/getTransaction.ts index 7e117b293e..c03ef4fca0 100644 --- a/packages/evmApi/src/resolvers/transaction/getTransaction.ts +++ b/packages/evmApi/src/resolvers/transaction/getTransaction.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmTransaction, EvmTransactionLog } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; diff --git a/packages/evmApi/src/resolvers/transaction/getWalletTransactions.ts b/packages/evmApi/src/resolvers/transaction/getWalletTransactions.ts index bda5d9da2f..8a47c5ed10 100644 --- a/packages/evmApi/src/resolvers/transaction/getWalletTransactions.ts +++ b/packages/evmApi/src/resolvers/transaction/getWalletTransactions.ts @@ -1,4 +1,4 @@ -import { BigNumber, Camelize } from '@moralisweb3/core'; +import { BigNumber, Camelize } from '@moralisweb3/common-core'; import { EvmChainish, EvmAddressish, EvmAddress, EvmTransaction } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { createPaginatedEndpointFactory, createPaginatedEndpoint, PaginatedParams } from '@moralisweb3/api-utils'; diff --git a/packages/moralis/CHANGELOG.md b/packages/moralis/CHANGELOG.md index 0f00f3b543..1a408c1fc0 100644 --- a/packages/moralis/CHANGELOG.md +++ b/packages/moralis/CHANGELOG.md @@ -705,7 +705,7 @@ 2. Install the specific packages that you want. For example `npm install @moralisweb3/evm` or `yarn add @moralisweb3/evm` 3. Register the installed package to the Core module, at the top of your code, before any interaction with Moralis: ```javascript - import Core from '@moralisweb3/core'; + import Core from '@moralisweb3/common-core'; import Evm from '@moralisweb3/evm'; ``` diff --git a/packages/moralis/package.json b/packages/moralis/package.json index 3b29fdafb3..8bb66b1698 100644 --- a/packages/moralis/package.json +++ b/packages/moralis/package.json @@ -18,7 +18,7 @@ }, "exports": { ".": "./lib/index.js", - "./core": "./lib/core/index.js", + "./common-core": "./lib/commonCore/index.js", "./streams-typings": "./lib/streamsTypings/index.js", "./common-evm-utils": "./lib/commonEvmUtils/index.js", "./common-sol-utils": "./lib/commonSolUtils/index.js" @@ -28,8 +28,8 @@ ".": [ "lib/index.d.ts" ], - "core": [ - "lib/core/index.d.ts" + "common-core": [ + "lib/commonCore/index.d.ts" ], "common-evm-utils": [ "lib/commonEvmUtils/index.d.ts" @@ -44,7 +44,7 @@ }, "dependencies": { "@moralisweb3/auth": "^2.6.7", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@moralisweb3/streams": "^2.6.7", "@moralisweb3/api-utils": "^2.6.7", "@moralisweb3/evm-api": "^2.6.7", diff --git a/packages/moralis/src/commonCore/index.ts b/packages/moralis/src/commonCore/index.ts new file mode 100644 index 0000000000..f8ad2e34e7 --- /dev/null +++ b/packages/moralis/src/commonCore/index.ts @@ -0,0 +1 @@ +export * from '@moralisweb3/common-core'; diff --git a/packages/moralis/src/core/index.ts b/packages/moralis/src/core/index.ts deleted file mode 100644 index 5601d47ebd..0000000000 --- a/packages/moralis/src/core/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@moralisweb3/core'; diff --git a/packages/moralis/src/index.ts b/packages/moralis/src/index.ts index 1a229c5a3a..9991ed3a25 100644 --- a/packages/moralis/src/index.ts +++ b/packages/moralis/src/index.ts @@ -5,7 +5,7 @@ import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { EvmApi } from '@moralisweb3/evm-api'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; import { SolApi } from '@moralisweb3/sol-api'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; // Core const core = MoralisCore.create(); diff --git a/packages/solApi/integration/setup.ts b/packages/solApi/integration/setup.ts index 26095194f7..28c0167462 100644 --- a/packages/solApi/integration/setup.ts +++ b/packages/solApi/integration/setup.ts @@ -1,5 +1,5 @@ import { ApiUtils } from '@moralisweb3/api-utils'; -import { MoralisCore } from '@moralisweb3/core'; +import { MoralisCore } from '@moralisweb3/common-core'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; import { SolApi } from '../src/SolApi'; import { MOCK_API_KEY } from './mocks/config'; diff --git a/packages/solApi/package.json b/packages/solApi/package.json index 968f836783..dcc3561a80 100644 --- a/packages/solApi/package.json +++ b/packages/solApi/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@moralisweb3/api-utils": "^2.6.7", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@moralisweb3/common-sol-utils": "^2.6.7" } } diff --git a/packages/solApi/src/SolApi.ts b/packages/solApi/src/SolApi.ts index 4b1f77c68f..149c226f52 100644 --- a/packages/solApi/src/SolApi.ts +++ b/packages/solApi/src/SolApi.ts @@ -1,5 +1,5 @@ import { OperationResolver } from '@moralisweb3/api-utils'; -import { ApiModule, MoralisCore, MoralisCoreProvider, Operation } from '@moralisweb3/core'; +import { ApiModule, MoralisCore, MoralisCoreProvider, Operation } from '@moralisweb3/common-core'; import { getBalanceOperation, getNFTMetadataOperation, diff --git a/packages/streams/integration/setup.ts b/packages/streams/integration/setup.ts index 6eeefe154d..ee19d39ee0 100644 --- a/packages/streams/integration/setup.ts +++ b/packages/streams/integration/setup.ts @@ -1,6 +1,6 @@ import { ApiUtils } from '@moralisweb3/api-utils'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { MoralisStreams } from '../src/MoralisStreams'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; diff --git a/packages/streams/package.json b/packages/streams/package.json index 1df1f85132..433bdf7ee6 100644 --- a/packages/streams/package.json +++ b/packages/streams/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@moralisweb3/api-utils": "^2.6.7", - "@moralisweb3/core": "^2.6.7", + "@moralisweb3/common-core": "^2.6.7", "@moralisweb3/common-evm-utils": "^2.6.7", "@moralisweb3/common-streams-utils": "^2.6.7", "@moralisweb3/streams-typings": "^1.0.5", diff --git a/packages/streams/src/MoralisStreams.ts b/packages/streams/src/MoralisStreams.ts index 94e9197133..bdf1f2c1bd 100644 --- a/packages/streams/src/MoralisStreams.ts +++ b/packages/streams/src/MoralisStreams.ts @@ -1,6 +1,6 @@ import { getSettings, setSettings } from './resolvers'; import { Endpoints } from '@moralisweb3/api-utils'; -import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { makeCreateStream } from './methods/create'; import { makeUpdateStream } from './methods/update'; import { makeDeleteStream } from './methods/delete'; diff --git a/packages/streams/src/methods/logParser.ts b/packages/streams/src/methods/logParser.ts index 3a6989b249..dec90d2387 100644 --- a/packages/streams/src/methods/logParser.ts +++ b/packages/streams/src/methods/logParser.ts @@ -1,4 +1,4 @@ -import { MoralisStreamError, StreamErrorCode } from '@moralisweb3/core'; +import { MoralisStreamError, StreamErrorCode } from '@moralisweb3/common-core'; import AbiUtils from 'web3-eth-abi'; import { isWebhook, diff --git a/packages/streams/src/methods/verifySignature.ts b/packages/streams/src/methods/verifySignature.ts index 3ef65adf32..52781f3361 100644 --- a/packages/streams/src/methods/verifySignature.ts +++ b/packages/streams/src/methods/verifySignature.ts @@ -1,5 +1,5 @@ import { ApiUtilsConfig } from '@moralisweb3/api-utils'; -import { MoralisCore, MoralisStreamError, StreamErrorCode } from '@moralisweb3/core'; +import { MoralisCore, MoralisStreamError, StreamErrorCode } from '@moralisweb3/common-core'; import { IWebhook } from '@moralisweb3/streams-typings'; import { sha3 } from '../utils/sha3'; diff --git a/packages/streams/src/resolvers/evmStreams/addAddressEvm.ts b/packages/streams/src/resolvers/evmStreams/addAddressEvm.ts index bdb21f1528..cf62b11395 100644 --- a/packages/streams/src/resolvers/evmStreams/addAddressEvm.ts +++ b/packages/streams/src/resolvers/evmStreams/addAddressEvm.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { toCamelCase } from '@moralisweb3/core'; +import { toCamelCase } from '@moralisweb3/common-core'; import { EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; diff --git a/packages/streams/src/resolvers/evmStreams/createStreamEvm.ts b/packages/streams/src/resolvers/evmStreams/createStreamEvm.ts index 871db78b91..f96d4db857 100644 --- a/packages/streams/src/resolvers/evmStreams/createStreamEvm.ts +++ b/packages/streams/src/resolvers/evmStreams/createStreamEvm.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChain, EvmChainish } from '@moralisweb3/common-evm-utils'; import { EvmStream } from '@moralisweb3/common-streams-utils'; import { operations } from '../../generated/types'; diff --git a/packages/streams/src/resolvers/evmStreams/deleteAddressEvm.ts b/packages/streams/src/resolvers/evmStreams/deleteAddressEvm.ts index 614553ce9a..57b394a116 100644 --- a/packages/streams/src/resolvers/evmStreams/deleteAddressEvm.ts +++ b/packages/streams/src/resolvers/evmStreams/deleteAddressEvm.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { toCamelCase } from '@moralisweb3/core'; +import { toCamelCase } from '@moralisweb3/common-core'; import { EvmAddress } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; diff --git a/packages/streams/src/resolvers/evmStreams/updateStreamEvm.ts b/packages/streams/src/resolvers/evmStreams/updateStreamEvm.ts index 88102b75ed..502e99a295 100644 --- a/packages/streams/src/resolvers/evmStreams/updateStreamEvm.ts +++ b/packages/streams/src/resolvers/evmStreams/updateStreamEvm.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import { Camelize } from '@moralisweb3/core'; +import { Camelize } from '@moralisweb3/common-core'; import { EvmChain, EvmChainish } from '@moralisweb3/common-evm-utils'; import { EvmStream } from '@moralisweb3/common-streams-utils'; import { operations } from '../../generated/types'; diff --git a/packages/streams/src/test/setup.ts b/packages/streams/src/test/setup.ts index a7dd989f60..8df493f655 100644 --- a/packages/streams/src/test/setup.ts +++ b/packages/streams/src/test/setup.ts @@ -1,4 +1,4 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/core'; +import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; import { MoralisStreams } from '../MoralisStreams'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; diff --git a/packages/streams/src/utils/IncorrectNetworkError.ts b/packages/streams/src/utils/IncorrectNetworkError.ts index 1bc91fa780..1d0142ca27 100644 --- a/packages/streams/src/utils/IncorrectNetworkError.ts +++ b/packages/streams/src/utils/IncorrectNetworkError.ts @@ -1,4 +1,4 @@ -import { MoralisStreamError, StreamErrorCode } from '@moralisweb3/core'; +import { MoralisStreamError, StreamErrorCode } from '@moralisweb3/common-core'; import { StreamNetwork } from './StreamNetwork'; export class IncorrectNetworkError extends MoralisStreamError { From 9b7111eb318a47f821cceeae9a2975083c9b8837 Mon Sep 17 00:00:00 2001 From: Erno Date: Tue, 25 Oct 2022 18:59:15 +0200 Subject: [PATCH 2/3] style: prettier formatting --- packages/apiUtils/src/resolvers/EndpointResolver.ts | 9 ++++++++- .../common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts | 7 ++++++- .../evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/apiUtils/src/resolvers/EndpointResolver.ts b/packages/apiUtils/src/resolvers/EndpointResolver.ts index 6d9d234831..3734e6458d 100644 --- a/packages/apiUtils/src/resolvers/EndpointResolver.ts +++ b/packages/apiUtils/src/resolvers/EndpointResolver.ts @@ -1,4 +1,11 @@ -import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController, CoreConfig } from '@moralisweb3/common-core'; +import { + MoralisCore, + ApiErrorCode, + Config, + MoralisApiError, + RequestController, + CoreConfig, +} from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config/ApiUtilsConfig'; import { isNotFoundError } from '../errors/isNotFoundError'; import { ApiResultAdapter } from './ApiResultAdapter'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts index 1042bc30d1..a704d9cd8c 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts @@ -1,4 +1,9 @@ -import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/common-core'; +import MoralisCore, { + MoralisDataObject, + BigNumber, + dateInputToDate, + MoralisCoreProvider, +} from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmTransaction } from '../EvmTransaction'; diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts index 006a212aaa..08da89f20e 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts @@ -1,4 +1,9 @@ -import MoralisCore, { MoralisDataObject, BigNumber, dateInputToDate, MoralisCoreProvider } from '@moralisweb3/common-core'; +import MoralisCore, { + MoralisDataObject, + BigNumber, + dateInputToDate, + MoralisCoreProvider, +} from '@moralisweb3/common-core'; import { EvmChain } from '../EvmChain'; import { EvmBlockish } from './EvmBlock'; import { EvmSimpleBlockInput, EvmSimpleBlockData } from './types'; From 675726738f86ebc29ea26487d9be4a21527476ca Mon Sep 17 00:00:00 2001 From: Erno Date: Wed, 26 Oct 2022 11:52:50 +0200 Subject: [PATCH 3/3] refactor: rename MoralisCore to Core --- README.md | 8 +++--- .../src/utils/ParseServerRequest.ts | 4 +-- packages/apiUtils/src/ApiUtils.ts | 8 +++--- packages/apiUtils/src/resolvers/Endpoint.ts | 4 +-- .../src/resolvers/EndpointResolver.test.ts | 6 ++--- .../src/resolvers/EndpointResolver.ts | 11 ++------ packages/apiUtils/src/resolvers/Endpoints.ts | 4 +-- .../src/resolvers/PaginatedEndpoint.ts | 4 +-- .../PaginatedEndpointResolver.test.ts | 4 +-- .../resolvers/PaginatedEndpointResolver.ts | 4 +-- .../src/resolvers/getCommonHeaders.ts | 4 +-- .../OperationRequestBuilder.test.ts | 6 ++--- .../src/resolvers2/OperationRequestBuilder.ts | 4 +-- .../src/resolvers2/OperationResolver.ts | 4 +-- .../resolvers2/PaginatedOperationResolver.ts | 4 +-- packages/apiUtils/src/test/setup.ts | 4 +-- packages/auth/integration/setup.ts | 6 ++--- packages/auth/src/MoralisAuth.ts | 8 +++--- packages/auth/src/methods/requestMessage.ts | 8 +++--- packages/auth/src/methods/verify.ts | 8 +++--- packages/common/core/README.md | 2 +- .../test/requestControllerDelete.test.ts | 4 +-- .../test/requestControllerGet.test.ts | 4 +-- .../test/requestControllerPost.test.ts | 4 +-- .../test/requestControllerPut.test.ts | 4 +-- .../core/src/Assert/assertUnreachable.ts | 4 +-- packages/common/core/src/Config/Config.ts | 8 +++--- .../core/src/{MoralisCore.ts => Core.ts} | 12 ++++----- packages/common/core/src/CoreProvider.ts | 26 +++++++++++++++++++ .../core/src/Error/MoralisError.test.ts | 6 ++--- .../common/core/src/Error/MoralisError.ts | 4 +-- packages/common/core/src/Modules/ApiModule.ts | 6 ++--- .../common/core/src/Modules/Module.test.ts | 6 ++--- packages/common/core/src/Modules/Module.ts | 8 +++--- .../common/core/src/Modules/Modules.test.ts | 10 +++---- packages/common/core/src/Modules/Modules.ts | 16 ++++++------ .../common/core/src/MoralisCoreProvider.ts | 26 ------------------- .../core/src/controllers/LoggerController.ts | 4 +-- .../RequestController/RequestController.ts | 12 ++++----- .../dataTypes/BigNumber/BigNumberFormatter.ts | 4 +-- .../dataTypes/BigNumber/BigNumberParser.ts | 4 +-- packages/common/core/src/index.ts | 8 +++--- .../common/core/src/operations/Operation.ts | 12 ++++----- .../common/evmUtils/src/CommonEvmUtils.ts | 8 +++--- .../common/evmUtils/src/EvmChainResolver.ts | 4 +-- .../evmUtils/src/dataTypes/Erc20/Erc20.ts | 10 +++---- .../src/dataTypes/Erc20Value/Erc20Value.ts | 6 ++--- .../dataTypes/EvmAddress/EvmAddress.test.ts | 4 +-- .../src/dataTypes/EvmAddress/EvmAddress.ts | 14 +++++----- .../src/dataTypes/EvmBlock/EvmBlock.ts | 15 ++++------- .../src/dataTypes/EvmBlock/EvmSimpleBlock.ts | 15 ++++------- .../src/dataTypes/EvmChain/EvmChain.test.ts | 4 +-- .../src/dataTypes/EvmChain/EvmChain.ts | 8 +++--- .../src/dataTypes/EvmChain/EvmChainParser.ts | 8 +++--- .../src/dataTypes/EvmEvent/EvmEvent.ts | 15 +++-------- .../src/dataTypes/EvmNative/EvmNative.ts | 4 +-- .../evmUtils/src/dataTypes/EvmNft/EvmNft.ts | 20 +++++++------- .../EvmNftCollection/EvmNftCollection.test.ts | 4 +-- .../EvmNftCollection/EvmNftCollection.ts | 10 +++---- .../EvmNftTransfer/EvmNftTransfer.ts | 16 ++++-------- .../EvmSignature/EvmSignature.test.ts | 4 +-- .../EvmTransaction/EvmTransaction.ts | 16 ++++-------- .../EvmTransactionLog/EvmTransactionLog.ts | 12 ++++----- .../token/getWalletTokenTransfersOperation.ts | 10 +++---- .../utils/runContractFunctionOperation.ts | 11 +++----- packages/common/evmUtils/src/test/setup.ts | 6 ++--- .../common/solUtils/src/CommonSolUtils.ts | 8 +++--- .../common/solUtils/src/SolNetworkResolver.ts | 4 +-- .../src/dataTypes/SolAddress/SolAddress.ts | 4 +-- .../src/dataTypes/SolNative/SolNative.ts | 4 +-- .../src/dataTypes/SolNetwork/SolNetwork.ts | 4 +-- .../operations/account/getBalanceOperation.ts | 6 ++--- .../operations/account/getNFTsOperation.ts | 6 ++--- .../account/getPortfolioOperation.ts | 6 ++--- .../src/operations/account/getSPLOperation.ts | 6 ++--- .../operations/nft/getNFTMetadataOperation.ts | 6 ++--- .../token/getTokenPriceOperation.ts | 6 ++--- .../src/dataTypes/EvmStream/EvmStream.test.ts | 4 +-- .../src/dataTypes/EvmStream/EvmStream.ts | 12 ++++----- .../EvmStreamResult/EvmStreamResult.test.ts | 4 +-- .../EvmStreamResult/EvmStreamResult.ts | 12 ++++----- .../EvmStreamResult/EvmStreamResultParser.ts | 6 ++--- .../StreamErc1155Approval.test.ts | 4 +-- .../StreamErc1155Approval.ts | 12 ++++----- .../StreamErc20Approval.test.ts | 4 +-- .../StreamErc20Approval.ts | 12 ++++----- .../StreamErc20Transfer.test.ts | 4 +-- .../StreamErc20Transfer.ts | 12 ++++----- .../StreamErc721Approval.test.ts | 4 +-- .../StreamErc721Approval.ts | 12 ++++----- .../StreamEvmInternalTransaction.test.ts | 4 +-- .../StreamEvmInternalTransaction.ts | 15 +++++------ .../StreamEvmNftTransfer.test.ts | 4 +-- .../StreamEvmNftTransfer.ts | 12 ++++----- .../StreamEvmTransaction.test.ts | 4 +-- .../StreamEvmTransaction.ts | 12 ++++----- .../StreamEvmTransactionLog.test.ts | 4 +-- .../StreamEvmTransactionLog.ts | 12 ++++----- .../common/streamsUtils/src/test/setup.ts | 6 ++--- packages/evmApi/integration/setup.ts | 6 ++--- packages/evmApi/src/EvmApi.test.ts | 4 +-- packages/evmApi/src/EvmApi.ts | 10 +++---- .../evmApi/src/resolvers/EvmChainResolver.ts | 4 +-- .../evmApi/src/resolvers/block/getBlock.ts | 4 +-- packages/moralis/src/index.ts | 8 +++--- packages/solApi/integration/setup.ts | 6 ++--- packages/solApi/src/SolApi.ts | 8 +++--- packages/streams/integration/setup.ts | 6 ++--- packages/streams/src/MoralisStreams.ts | 8 +++--- .../streams/src/methods/verifySignature.ts | 4 +-- packages/streams/src/test/setup.ts | 6 ++--- 111 files changed, 399 insertions(+), 441 deletions(-) rename packages/common/core/src/{MoralisCore.ts => Core.ts} (88%) create mode 100644 packages/common/core/src/CoreProvider.ts delete mode 100644 packages/common/core/src/MoralisCoreProvider.ts diff --git a/README.md b/README.md index 5d95bb092a..ca6fe3fb81 100644 --- a/README.md +++ b/README.md @@ -124,10 +124,10 @@ yarn add @moralisweb3/common-core @moralisweb3/evm @moralisweb3/evm-api @moralis Then at the top of your code (before any interaction with Moralis), you need to register the modules to the core package ```javascript -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import MoralisEvmApi from '@moralisweb3/evm-api'; -const core = MoralisCore.create(); +const core = Core.create(); // Register all imported modules to the @moralisweb3/common-core module core.registerModules([MoralisEvmApi]); ``` @@ -162,10 +162,10 @@ Of course you are free to combine the modules in a single object, and use that i ```javascript // moralis.ts -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import EvmApi from '@moralisweb3/evm-api'; -const core = MoralisCore.create(); +const core = Core.create(); const evmApi = EvmApi.create(core); core.registerModules([evmApi]); diff --git a/demos/parse-server/src/utils/ParseServerRequest.ts b/demos/parse-server/src/utils/ParseServerRequest.ts index b122cd3ee3..b9faf7858a 100644 --- a/demos/parse-server/src/utils/ParseServerRequest.ts +++ b/demos/parse-server/src/utils/ParseServerRequest.ts @@ -1,11 +1,11 @@ -import { MoralisCoreProvider, RequestController } from '@moralisweb3/common-core'; +import { CoreProvider, RequestController } from '@moralisweb3/common-core'; import config from '../config'; export class ParseServerRequest { protected readonly requestController: RequestController; constructor() { - const core = MoralisCoreProvider.getDefault(); + const core = CoreProvider.getDefault(); this.requestController = RequestController.create(core); } diff --git a/packages/apiUtils/src/ApiUtils.ts b/packages/apiUtils/src/ApiUtils.ts index c2c96dfc46..8dd83cbf95 100644 --- a/packages/apiUtils/src/ApiUtils.ts +++ b/packages/apiUtils/src/ApiUtils.ts @@ -1,14 +1,14 @@ -import { Module, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Module, Core, CoreProvider } from '@moralisweb3/common-core'; import { ApiUtilsConfigSetup } from './config/ApiUtilsConfigSetup'; export class ApiUtils extends Module { public static readonly moduleName = 'api'; - public static create(core?: MoralisCore): ApiUtils { - return new ApiUtils(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): ApiUtils { + return new ApiUtils(core ?? CoreProvider.getDefault()); } - public constructor(core: MoralisCore) { + public constructor(core: Core) { super(ApiUtils.moduleName, core); } diff --git a/packages/apiUtils/src/resolvers/Endpoint.ts b/packages/apiUtils/src/resolvers/Endpoint.ts index 1cdb369c13..e8b2620726 100644 --- a/packages/apiUtils/src/resolvers/Endpoint.ts +++ b/packages/apiUtils/src/resolvers/Endpoint.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; export type EndpointMethod = 'get' | 'post' | 'put' | 'delete'; @@ -21,7 +21,7 @@ export interface Endpoint = ( - core: MoralisCore, + core: Core, ) => Endpoint; export function createEndpointFactory( diff --git a/packages/apiUtils/src/resolvers/EndpointResolver.test.ts b/packages/apiUtils/src/resolvers/EndpointResolver.test.ts index 248140de41..fbd3cf035a 100644 --- a/packages/apiUtils/src/resolvers/EndpointResolver.test.ts +++ b/packages/apiUtils/src/resolvers/EndpointResolver.test.ts @@ -3,7 +3,7 @@ import { ApiFormatType } from './ApiResultAdapter'; import axios from 'axios'; import { EndpointResolver } from './EndpointResolver'; import { setupApi } from '../test/setup'; -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { createEndpoint, createEndpointFactory } from './Endpoint'; const MOCK_API_KEY = 'test-api-key'; @@ -25,7 +25,7 @@ interface EndpointWeight { } describe('ApiResolver', () => { - let core: MoralisCore; + let core: Core; let resolver: EndpointResolver< unknown, unknown, @@ -97,7 +97,7 @@ describe('ApiResolver', () => { 'x-api-key': MOCK_API_KEY, 'x-moralis-build-target': expect.any(String), 'x-moralis-platform': expect.any(String), - 'x-moralis-platform-version': MoralisCore.libVersion, + 'x-moralis-platform-version': Core.libVersion, }), }), ); diff --git a/packages/apiUtils/src/resolvers/EndpointResolver.ts b/packages/apiUtils/src/resolvers/EndpointResolver.ts index 3734e6458d..fc68a02bc9 100644 --- a/packages/apiUtils/src/resolvers/EndpointResolver.ts +++ b/packages/apiUtils/src/resolvers/EndpointResolver.ts @@ -1,11 +1,4 @@ -import { - MoralisCore, - ApiErrorCode, - Config, - MoralisApiError, - RequestController, - CoreConfig, -} from '@moralisweb3/common-core'; +import { Core, ApiErrorCode, Config, MoralisApiError, RequestController, CoreConfig } from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config/ApiUtilsConfig'; import { isNotFoundError } from '../errors/isNotFoundError'; import { ApiResultAdapter } from './ApiResultAdapter'; @@ -15,7 +8,7 @@ import { getCommonHeaders } from './getCommonHeaders'; export class EndpointResolver { public static create( - core: MoralisCore, + core: Core, baseUrl: string, endpointFactory: EndpointFactory, ) { diff --git a/packages/apiUtils/src/resolvers/Endpoints.ts b/packages/apiUtils/src/resolvers/Endpoints.ts index e67c282bce..b7f320fa2e 100644 --- a/packages/apiUtils/src/resolvers/Endpoints.ts +++ b/packages/apiUtils/src/resolvers/Endpoints.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { Endpoint, EndpointFactory, EndpointMethod } from './Endpoint'; import { EndpointResolver } from './EndpointResolver'; import { PaginatedEndpointFactory, PaginatedParams } from './PaginatedEndpoint'; @@ -18,7 +18,7 @@ export class Endpoints { // eslint-disable-next-line @typescript-eslint/no-explicit-any private readonly endpoints: Endpoint[] = []; - public constructor(private readonly core: MoralisCore, private readonly baseUrl: string) {} + public constructor(private readonly core: Core, private readonly baseUrl: string) {} public createFetcher( factory: EndpointFactory, diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts b/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts index 4dafe79607..0c3a9e2030 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpoint.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { Endpoint, EndpointBodyType } from './Endpoint'; export interface PaginatedParams extends Record { @@ -24,7 +24,7 @@ export type PaginatedEndpointFactory< ApiResult, AdaptedResult, JSONResult, -> = (core: MoralisCore) => PaginatedEndpoint; +> = (core: Core) => PaginatedEndpoint; export function createPaginatedEndpointFactory< ApiParams, diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts index 2a92007cdf..5ad135ebde 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.test.ts @@ -10,7 +10,7 @@ import { } from './PaginatedEndpoint'; import { setupApi } from '../test/setup'; import { PaginatedEndpointResolver } from './PaginatedEndpointResolver'; -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; const MOCK_API_KEY = 'test-api-key'; const API_ROOT = 'https://deep-index.moralis.io/api/v2'; @@ -60,7 +60,7 @@ type ApiResult = { }[]; describe('PaginatedEndpointResolver', () => { - let core: MoralisCore; + let core: Core; let resolver: PaginatedEndpointResolver< any, Params, diff --git a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts index d333943d54..a3d11da206 100644 --- a/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts +++ b/packages/apiUtils/src/resolvers/PaginatedEndpointResolver.ts @@ -1,7 +1,7 @@ import { tryGetNextPageParams } from '../utils/tryGetNextPageParams'; import { ApiPaginatedResultAdapter } from './ApiPaginatedResultAdapter'; import { ApiUtilsConfig } from '../config/ApiUtilsConfig'; -import { MoralisCore, ApiErrorCode, Config, MoralisApiError, RequestController } from '@moralisweb3/common-core'; +import { Core, ApiErrorCode, Config, MoralisApiError, RequestController } from '@moralisweb3/common-core'; import { PaginatedResult, PaginatedEndpoint, PaginatedEndpointFactory, PaginatedParams } from './PaginatedEndpoint'; import { EndpointParamsReader } from './EndpointParamsReader'; @@ -13,7 +13,7 @@ export class PaginatedEndpointResolver< JSONResult, > { public static create( - core: MoralisCore, + core: Core, baseUrl: string, endpointFactory: PaginatedEndpointFactory, ) { diff --git a/packages/apiUtils/src/resolvers/getCommonHeaders.ts b/packages/apiUtils/src/resolvers/getCommonHeaders.ts index 3af2c411da..89ecdb1255 100644 --- a/packages/apiUtils/src/resolvers/getCommonHeaders.ts +++ b/packages/apiUtils/src/resolvers/getCommonHeaders.ts @@ -1,9 +1,9 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; export type Headers = { [key: string]: string }; export const getCommonHeaders = (): Headers => ({ 'x-moralis-platform': 'JS SDK', - 'x-moralis-platform-version': MoralisCore.libVersion, + 'x-moralis-platform-version': Core.libVersion, 'x-moralis-build-target': 'node', }); diff --git a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts index 7da53d9c9c..4ee9226928 100644 --- a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts +++ b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.test.ts @@ -1,4 +1,4 @@ -import MoralisCore, { Operation, OperationRequestPropertiesBody } from '@moralisweb3/common-core'; +import Core, { Operation, OperationRequestPropertiesBody } from '@moralisweb3/common-core'; import { ApiUtilsConfig } from '../config'; import { OperationRequestBuilder } from './OperationRequestBuilder'; @@ -44,11 +44,11 @@ const operation: Operation = { describe('OperationRequestBuilder', () => { const API_KEY = '0000000000000000000000000000000000000000000000000000000000000123'; - let core: MoralisCore; + let core: Core; let builder: OperationRequestBuilder; beforeEach(() => { - core = MoralisCore.create(); + core = Core.create(); core.config.registerKey(ApiUtilsConfig.apiKey); core.config.set(ApiUtilsConfig.apiKey, API_KEY); builder = new OperationRequestBuilder(operation, core); diff --git a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts index e97d91ba7c..96c4d61a44 100644 --- a/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts +++ b/packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts @@ -1,4 +1,4 @@ -import MoralisCore, { +import Core, { ApiErrorCode, MoralisApiError, Operation, @@ -12,7 +12,7 @@ import { getCommonHeaders } from '../resolvers/getCommonHeaders'; export class OperationRequestBuilder { public constructor( private readonly operation: Operation, - private readonly core: MoralisCore, + private readonly core: Core, ) {} public prepareUrl(request: Request) { diff --git a/packages/apiUtils/src/resolvers2/OperationResolver.ts b/packages/apiUtils/src/resolvers2/OperationResolver.ts index 8b8adb85a5..01b67afd40 100644 --- a/packages/apiUtils/src/resolvers2/OperationResolver.ts +++ b/packages/apiUtils/src/resolvers2/OperationResolver.ts @@ -1,4 +1,4 @@ -import MoralisCore, { +import Core, { ApiErrorCode, MoralisApiError, RequestController, @@ -18,7 +18,7 @@ export class OperationResolver { public constructor( private readonly operation: Operation, private readonly baseUrl: string, - private readonly core: MoralisCore, + private readonly core: Core, ) {} public readonly fetch = async (request: Request): Promise> => { diff --git a/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts b/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts index 4d3d9b1b8f..afda25da69 100644 --- a/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts +++ b/packages/apiUtils/src/resolvers2/PaginatedOperationResolver.ts @@ -1,4 +1,4 @@ -import MoralisCore, { +import Core, { PaginatedRequest, OperationRequestValidator, RequestController, @@ -17,7 +17,7 @@ export class PaginatedOperationResolver, private readonly baseUrl: string, - private readonly core: MoralisCore, + private readonly core: Core, ) {} public readonly fetch = async (request: Request): Promise> => { diff --git a/packages/apiUtils/src/test/setup.ts b/packages/apiUtils/src/test/setup.ts index 9fd096cb4c..2336715f69 100644 --- a/packages/apiUtils/src/test/setup.ts +++ b/packages/apiUtils/src/test/setup.ts @@ -1,9 +1,9 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { ApiUtils } from '../ApiUtils'; export const setupApi = () => { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const evmUtils = CommonEvmUtils.create(core); diff --git a/packages/auth/integration/setup.ts b/packages/auth/integration/setup.ts index 8ebda680ef..f88fbcfbd7 100644 --- a/packages/auth/integration/setup.ts +++ b/packages/auth/integration/setup.ts @@ -1,19 +1,19 @@ import { ApiUtils } from '@moralisweb3/api-utils'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; import { MoralisAuth } from '../src/MoralisAuth'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; export function setupAuth(): MoralisAuth { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const commonEvmUtils = CommonEvmUtils.create(core); const commonSolUtils = CommonSolUtils.create(core); const auth = MoralisAuth.create(core); - MoralisCoreProvider.setDefault(core); + CoreProvider.setDefault(core); core.registerModules([apiUtils, commonEvmUtils, commonSolUtils, auth]); core.start({ diff --git a/packages/auth/src/MoralisAuth.ts b/packages/auth/src/MoralisAuth.ts index 1921a9f68b..330aa6078d 100644 --- a/packages/auth/src/MoralisAuth.ts +++ b/packages/auth/src/MoralisAuth.ts @@ -1,4 +1,4 @@ -import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { ApiModule, Core, CoreProvider } from '@moralisweb3/common-core'; import { makeRequestMessage, RequestMessageOptions } from './methods/requestMessage'; import { makeVerify, @@ -14,11 +14,11 @@ export const BASE_URL = 'https://authapi.moralis.io'; export class MoralisAuth extends ApiModule { public static readonly moduleName = 'auth'; - public static create(core?: MoralisCore): MoralisAuth { - return new MoralisAuth(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): MoralisAuth { + return new MoralisAuth(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(MoralisAuth.moduleName, core, BASE_URL); } diff --git a/packages/auth/src/methods/requestMessage.ts b/packages/auth/src/methods/requestMessage.ts index 4a36dededb..7ad727948c 100644 --- a/packages/auth/src/methods/requestMessage.ts +++ b/packages/auth/src/methods/requestMessage.ts @@ -1,6 +1,6 @@ import { SolAddressish, SolNetworkish, SolAddress, SolNetwork } from '@moralisweb3/common-sol-utils'; import { EndpointResolver } from '@moralisweb3/api-utils'; -import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; +import Core, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '@moralisweb3/common-evm-utils'; import { BASE_URL } from '../MoralisAuth'; import { initializeChallengeEvm, initializeChallengeSol } from '../resolvers'; @@ -48,7 +48,7 @@ export interface RequestMessageSolOptions { export type RequestMessageOptions = RequestMessageEvmOptions | RequestMessageSolOptions; const makeEvmRequestMessage = ( - core: MoralisCore, + core: Core, { chain, address, networkType, network, ...options }: RequestMessageEvmOptions, ) => { return EndpointResolver.create(core, BASE_URL, initializeChallengeEvm).fetch({ @@ -59,7 +59,7 @@ const makeEvmRequestMessage = ( }; const makeSolRequestMessage = ( - core: MoralisCore, + core: Core, { address, solNetwork, networkType, network, ...options }: RequestMessageSolOptions, ) => { return EndpointResolver.create(core, BASE_URL, initializeChallengeSol).fetch({ @@ -69,7 +69,7 @@ const makeSolRequestMessage = ( }); }; -export const makeRequestMessage = (core: MoralisCore) => async (options: RequestMessageOptions) => { +export const makeRequestMessage = (core: Core) => async (options: RequestMessageOptions) => { // Backwards compatibility for the 'network' parameter if (!options.networkType && options.network) { options.networkType = options.network; diff --git a/packages/auth/src/methods/verify.ts b/packages/auth/src/methods/verify.ts index a0a8c2595a..1eeda99bfd 100644 --- a/packages/auth/src/methods/verify.ts +++ b/packages/auth/src/methods/verify.ts @@ -1,5 +1,5 @@ import { EndpointResolver } from '@moralisweb3/api-utils'; -import MoralisCore, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; +import Core, { AuthErrorCode, MoralisAuthError } from '@moralisweb3/common-core'; import { BASE_URL } from '../MoralisAuth'; import { completeChallengeEvm, completeChallengeSol } from '../resolvers'; import { AuthNetworkType } from '../utils/AuthNetworkType'; @@ -29,21 +29,21 @@ export type VerifyOptions = VerifyEvmOptions | VerifySolOptions; export type VerifyEvmData = ReturnType; export type VerifySolData = ReturnType; -const makeEvmVerify = (core: MoralisCore, { networkType, network, ...options }: VerifyEvmOptions) => { +const makeEvmVerify = (core: Core, { networkType, network, ...options }: VerifyEvmOptions) => { return EndpointResolver.create(core, BASE_URL, completeChallengeEvm).fetch({ message: options.message, signature: options.signature, }); }; -const makeSolVerify = (core: MoralisCore, { networkType, network, ...options }: VerifySolOptions) => { +const makeSolVerify = (core: Core, { networkType, network, ...options }: VerifySolOptions) => { return EndpointResolver.create(core, BASE_URL, completeChallengeSol).fetch({ message: options.message, signature: options.signature, }); }; -export const makeVerify = (core: MoralisCore) => async (options: VerifyOptions) => { +export const makeVerify = (core: Core) => async (options: VerifyOptions) => { // Backwards compatibility for the 'network' parameter if (!options.networkType && options.network) { options.networkType = options.network; diff --git a/packages/common/core/README.md b/packages/common/core/README.md index 39aa2e6b15..195fffe7f2 100644 --- a/packages/common/core/README.md +++ b/packages/common/core/README.md @@ -127,7 +127,7 @@ Accepts the same options as `get()`, with the addition of `body`, which is an (J Errors within Moralis are an instance of `MoralisError`. These are extended into a few different classes: -- `MoralisCoreError` +- `CoreError` - `MoralisApiError` Which are used in there respective packages. Creating a new error must accept the following 2 params: diff --git a/packages/common/core/integration/test/requestControllerDelete.test.ts b/packages/common/core/integration/test/requestControllerDelete.test.ts index b12441f673..837ef084ab 100644 --- a/packages/common/core/integration/test/requestControllerDelete.test.ts +++ b/packages/common/core/integration/test/requestControllerDelete.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore, RequestController } from '../../src'; +import { Core, RequestController } from '../../src'; import { setupServer } from 'msw/node'; import { rest } from 'msw'; @@ -120,7 +120,7 @@ describe('RequestControllerDelete', () => { let requestController: RequestController; beforeAll(() => { - const core = MoralisCore.create(); + const core = Core.create(); requestController = RequestController.create(core); mockServer.listen({ diff --git a/packages/common/core/integration/test/requestControllerGet.test.ts b/packages/common/core/integration/test/requestControllerGet.test.ts index a17519b810..40ec5bd240 100644 --- a/packages/common/core/integration/test/requestControllerGet.test.ts +++ b/packages/common/core/integration/test/requestControllerGet.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore, RequestController } from '../../src'; +import { Core, RequestController } from '../../src'; import { setupServer } from 'msw/node'; import { rest } from 'msw'; @@ -86,7 +86,7 @@ describe('RequestControllerGet', () => { let requestController: RequestController; beforeAll(() => { - const core = MoralisCore.create(); + const core = Core.create(); requestController = RequestController.create(core); mockServer.listen({ diff --git a/packages/common/core/integration/test/requestControllerPost.test.ts b/packages/common/core/integration/test/requestControllerPost.test.ts index 414350c0ae..52aa4518e2 100644 --- a/packages/common/core/integration/test/requestControllerPost.test.ts +++ b/packages/common/core/integration/test/requestControllerPost.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore, RequestController } from '../../src'; +import { Core, RequestController } from '../../src'; import { setupServer } from 'msw/node'; import { rest } from 'msw'; @@ -117,7 +117,7 @@ describe('RequestControllerPost', () => { let requestController: RequestController; beforeAll(() => { - const core = MoralisCore.create(); + const core = Core.create(); requestController = RequestController.create(core); mockServer.listen({ diff --git a/packages/common/core/integration/test/requestControllerPut.test.ts b/packages/common/core/integration/test/requestControllerPut.test.ts index 29eab99fca..99f00ebe69 100644 --- a/packages/common/core/integration/test/requestControllerPut.test.ts +++ b/packages/common/core/integration/test/requestControllerPut.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore, RequestController } from '../../src'; +import { Core, RequestController } from '../../src'; import { setupServer } from 'msw/node'; import { rest } from 'msw'; @@ -117,7 +117,7 @@ describe('RequestControllerPut', () => { let requestController: RequestController; beforeAll(() => { - const core = MoralisCore.create(); + const core = Core.create(); requestController = RequestController.create(core); mockServer.listen({ diff --git a/packages/common/core/src/Assert/assertUnreachable.ts b/packages/common/core/src/Assert/assertUnreachable.ts index 7761f815a0..61438e81b9 100644 --- a/packages/common/core/src/Assert/assertUnreachable.ts +++ b/packages/common/core/src/Assert/assertUnreachable.ts @@ -1,6 +1,6 @@ -import { CoreErrorCode, MoralisCoreError } from '../Error'; +import { CoreErrorCode, CoreError } from '../Error'; -export const UnreachableError = new MoralisCoreError({ +export const UnreachableError = new CoreError({ code: CoreErrorCode.GENERIC_CORE_ERROR, message: `Incorrect type provided, code should not reach here`, }); diff --git a/packages/common/core/src/Config/Config.ts b/packages/common/core/src/Config/Config.ts index 786b476142..7c2728f7b1 100644 --- a/packages/common/core/src/Config/Config.ts +++ b/packages/common/core/src/Config/Config.ts @@ -1,11 +1,11 @@ -import { CoreErrorCode, MoralisCoreError } from '../Error'; +import { CoreErrorCode, CoreError } from '../Error'; export class Config { private readonly items = new Map>(); public registerKey(key: ConfigKey, validator?: ConfigKeyValidator) { if (this.items.has(key.name)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.CONFIG_KEY_ALREADY_EXIST, message: `Key "${key.name}" is already registered`, }); @@ -29,7 +29,7 @@ export class Config { const item = this.getItem(keyOrName); const error = item.validator ? item.validator(value) : null; if (error) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.CONFIG_INVALID_VALUE, message: `Cannot set this config. Invalid value for "${item.key.name}". ${error}`, }); @@ -56,7 +56,7 @@ export class Config { // This error occurs when a user tries to set a value for a specific key, but the key is not registered. // That situation may occur, when a moralis module is not registered (all keys are registered in the module setup step). // If you have this error, you should fix your code. Firstly, you should register all modules, later you can modify the configuration. - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.CONFIG_KEY_NOT_EXIST, message: `Key "${keyName}" is unregistered. Have you registered all required modules?`, }); diff --git a/packages/common/core/src/MoralisCore.ts b/packages/common/core/src/Core.ts similarity index 88% rename from packages/common/core/src/MoralisCore.ts rename to packages/common/core/src/Core.ts index 7d576246da..c34533a9bf 100644 --- a/packages/common/core/src/MoralisCore.ts +++ b/packages/common/core/src/Core.ts @@ -7,26 +7,26 @@ import { MoralisConfigValues } from './Config'; import { LIB_VERSION } from './version'; /** - * MoralisCore is used in all Moralis applications + * Core is used in all Moralis applications * This class is **required** to be implemented in every app * * This class is responsible for: * - registering, removing and accessing modules * - accessing and changing the config */ -export class MoralisCore { +export class Core { public static readonly moduleName = 'core'; - public static create(): MoralisCore { + public static create(): Core { const modules = new Modules(); const config = new Config(); - const logger = new LoggerController(MoralisCore.moduleName, config); - const core = new MoralisCore(modules, config, logger); + const logger = new LoggerController(Core.moduleName, config); + const core = new Core(modules, config, logger); CoreConfigSetup.register(config); return core; } - public readonly name = MoralisCore.moduleName; + public readonly name = Core.moduleName; public static readonly libVersion = LIB_VERSION; diff --git a/packages/common/core/src/CoreProvider.ts b/packages/common/core/src/CoreProvider.ts new file mode 100644 index 0000000000..6f79d7eafa --- /dev/null +++ b/packages/common/core/src/CoreProvider.ts @@ -0,0 +1,26 @@ +import { CoreErrorCode, CoreError } from './Error'; +import { Core } from './Core'; + +export class CoreProvider { + private static core?: Core; + + public static getDefault(): Core { + if (!this.core) { + throw new CoreError({ + code: CoreErrorCode.NOT_INITIALIZED, + message: 'Default instance of Core is not set', + }); + } + return this.core; + } + + public static setDefault(core: Core) { + if (this.core) { + throw new CoreError({ + code: CoreErrorCode.ALREADY_INITIALIZED, + message: 'Default instance of Core is already set', + }); + } + this.core = core; + } +} diff --git a/packages/common/core/src/Error/MoralisError.test.ts b/packages/common/core/src/Error/MoralisError.test.ts index b4d8a40b86..8698f0397d 100644 --- a/packages/common/core/src/Error/MoralisError.test.ts +++ b/packages/common/core/src/Error/MoralisError.test.ts @@ -1,5 +1,5 @@ import { ApiErrorCode, CoreErrorCode, MoralisErrorCode } from './ErrorCode'; -import { MoralisApiError, MoralisCoreError, MoralisError, MoralisErrorOptions } from './MoralisError'; +import { MoralisApiError, CoreError, MoralisError, MoralisErrorOptions } from './MoralisError'; function createOptions(code: T): MoralisErrorOptions { return { @@ -45,9 +45,9 @@ describe('MoralisError', () => { }); }); -describe('MoralisCoreError', () => { +describe('CoreError', () => { it('creates a proper name and a correct message', () => { - const error = new MoralisCoreError(createOptions(CoreErrorCode.GENERIC_CORE_ERROR)); + const error = new CoreError(createOptions(CoreErrorCode.GENERIC_CORE_ERROR)); expect(error.name).toEqual('Moralis SDK Core Error'); expect(error.message).toEqual('[C0001] test'); }); diff --git a/packages/common/core/src/Error/MoralisError.ts b/packages/common/core/src/Error/MoralisError.ts index 18b8a3418e..bb5a5f8b85 100644 --- a/packages/common/core/src/Error/MoralisError.ts +++ b/packages/common/core/src/Error/MoralisError.ts @@ -42,13 +42,13 @@ export class MoralisError extends Error { } } -export class MoralisCoreError extends MoralisError { +export class CoreError extends MoralisError { public readonly name: string = 'Moralis SDK Core Error'; public constructor(options: MoralisErrorOptions) { super(options); if (Error.captureStackTrace) { - Error.captureStackTrace(this, MoralisCoreError); + Error.captureStackTrace(this, CoreError); } } } diff --git a/packages/common/core/src/Modules/ApiModule.ts b/packages/common/core/src/Modules/ApiModule.ts index f990aaad43..8a28e23780 100644 --- a/packages/common/core/src/Modules/ApiModule.ts +++ b/packages/common/core/src/Modules/ApiModule.ts @@ -1,18 +1,18 @@ import { ModuleType } from './ModuleType'; import { Module } from './Module'; import { EventMap } from 'typed-emitter'; -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; /** * The base class of every Moralis Api class that gets registered as a module via MoralisModules * It should always be created with: * - `name`: name of the module (should be unique) - * - `core`: the MoralisCore instance + * - `core`: the Core instance * - `baseUrl`: the base url where of the api */ // eslint-disable-next-line @typescript-eslint/no-explicit-any export abstract class ApiModule extends Module { - public constructor(name: string, core: MoralisCore, public readonly baseUrl: string) { + public constructor(name: string, core: Core, public readonly baseUrl: string) { super(name, core, ModuleType.API); } } diff --git a/packages/common/core/src/Modules/Module.test.ts b/packages/common/core/src/Modules/Module.test.ts index 6378f0d5e2..925f9ad9ea 100644 --- a/packages/common/core/src/Modules/Module.test.ts +++ b/packages/common/core/src/Modules/Module.test.ts @@ -1,5 +1,5 @@ import { ModuleType } from './ModuleType'; -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; import { Module } from './Module'; describe('Module', () => { @@ -20,11 +20,11 @@ describe('Module', () => { } } - let core: MoralisCore; + let core: Core; let module: TestModule; beforeAll(() => { - core = MoralisCore.create(); + core = Core.create(); module = new TestModule(MODULE_NAME, core); core.modules.register(module); }); diff --git a/packages/common/core/src/Modules/Module.ts b/packages/common/core/src/Modules/Module.ts index 529d415121..8ab71d9d45 100644 --- a/packages/common/core/src/Modules/Module.ts +++ b/packages/common/core/src/Modules/Module.ts @@ -1,5 +1,5 @@ import EventEmitter from 'eventemitter3'; -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; import { LoggerController } from '../controllers/LoggerController'; import { ModuleType } from './ModuleType'; import TypedEmitter, { EventMap } from 'typed-emitter'; @@ -8,7 +8,7 @@ import TypedEmitter, { EventMap } from 'typed-emitter'; * The base class of every Moralis class that gets registered as a module via MoralisModules * It should always be created with: * - `name`: name of the module (should be unique) - * - `core`: the MoralisCore instance + * - `core`: the Core instance * - `type`: (optional) CoreModuleType, defaults to CoreModuleType.DEFAULT * * When creating an api, or network module, you should use the ApiModule or NetworkModule @@ -20,7 +20,7 @@ export abstract class Module { public constructor( public readonly name: string, - protected readonly core: MoralisCore, + protected readonly core: Core, public readonly type: ModuleType = ModuleType.DEFAULT, ) {} @@ -50,5 +50,5 @@ export abstract class Module { } export interface ModuleFactory { - create(core: MoralisCore): Module; + create(core: Core): Module; } diff --git a/packages/common/core/src/Modules/Modules.test.ts b/packages/common/core/src/Modules/Modules.test.ts index 8e55bb9919..2a29dd2c0f 100644 --- a/packages/common/core/src/Modules/Modules.test.ts +++ b/packages/common/core/src/Modules/Modules.test.ts @@ -1,6 +1,6 @@ import { Config } from '../Config/Config'; import { LoggerController } from '../controllers/LoggerController'; -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; import { ApiModule } from './ApiModule'; import { Module } from './Module'; import { Modules } from './Modules'; @@ -9,7 +9,7 @@ const TEST_MODULE_NAME = 'test'; const TEST_API_MODULE_NAME = 'testApiModule'; class TestModule extends Module { - public constructor(core: MoralisCore) { + public constructor(core: Core) { super(TEST_MODULE_NAME, core); } public setup() { @@ -21,7 +21,7 @@ class TestModule extends Module { } class TestApiModule extends ApiModule { - public constructor(core: MoralisCore) { + public constructor(core: Core) { super(TEST_API_MODULE_NAME, core, 'http://foo'); } public setup(): void { @@ -33,7 +33,7 @@ class TestApiModule extends ApiModule { } describe('Modules', () => { - let core: MoralisCore; + let core: Core; let modules: Modules; function createTestModule(): TestModule { @@ -47,7 +47,7 @@ describe('Modules', () => { beforeEach(() => { modules = new Modules(); const config = new Config(); - core = new MoralisCore(modules, config, new LoggerController(TEST_MODULE_NAME, config)); + core = new Core(modules, config, new LoggerController(TEST_MODULE_NAME, config)); }); describe('register()', () => { diff --git a/packages/common/core/src/Modules/Modules.ts b/packages/common/core/src/Modules/Modules.ts index 86dfcd3acf..44202164cc 100644 --- a/packages/common/core/src/Modules/Modules.ts +++ b/packages/common/core/src/Modules/Modules.ts @@ -1,7 +1,7 @@ import { Module } from './Module'; import { isApiModule } from './utils'; import { AnyBaseClass } from './types'; -import { CoreErrorCode, MoralisCoreError } from '../Error'; +import { CoreErrorCode, CoreError } from '../Error'; import { ApiModule } from './ApiModule'; /** @@ -24,7 +24,7 @@ export class Modules { */ public register(module: AnyBaseClass) { if (this.modules.has(module.name)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.DUPLICATE_MODULE, message: `The module "${module.name}" has already been registered.`, }); @@ -39,12 +39,12 @@ export class Modules { * This module should have been registered with `register` * @param name the module name * @returns a valid BaseModule - * @throws a MoralisCoreError if no module with the given name has been registered + * @throws a CoreError if no module with the given name has been registered */ public get(name: string): CurrentModule { const module = this.modules.get(name); if (!module) { - throw new MoralisCoreError({ code: CoreErrorCode.MODULE_NOT_FOUND, message: `Module "${name}" does not exist.` }); + throw new CoreError({ code: CoreErrorCode.MODULE_NOT_FOUND, message: `Module "${name}" does not exist.` }); } return module as CurrentModule; } @@ -66,13 +66,13 @@ export class Modules { * Returns the network module with the provided name. * @param name the module name * @returns a valid ApiModule - * @throws a MoralisCoreError if no network module with the given name has been registered + * @throws a CoreError if no network module with the given name has been registered */ public getApi(name: string): ApiModule { const module = this.modules.get(name); if (!module || !isApiModule(module)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.MODULE_NOT_FOUND, message: `No ApiModule found with the name "${name}"`, }); @@ -84,13 +84,13 @@ export class Modules { /** * Remove the module with the provided name, if it has been registered, * @param name the module name - * @throws a MoralisCoreError if the module cannot be found. + * @throws a CoreError if the module cannot be found. */ public remove(name: string) { const isRemoved = this.modules.delete(name); if (!isRemoved) { - throw new MoralisCoreError({ code: CoreErrorCode.MODULE_NOT_FOUND, message: `Module "${name}" does not exist.` }); + throw new CoreError({ code: CoreErrorCode.MODULE_NOT_FOUND, message: `Module "${name}" does not exist.` }); } } diff --git a/packages/common/core/src/MoralisCoreProvider.ts b/packages/common/core/src/MoralisCoreProvider.ts deleted file mode 100644 index 1dde3eb008..0000000000 --- a/packages/common/core/src/MoralisCoreProvider.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { CoreErrorCode, MoralisCoreError } from './Error'; -import { MoralisCore } from './MoralisCore'; - -export class MoralisCoreProvider { - private static core?: MoralisCore; - - public static getDefault(): MoralisCore { - if (!this.core) { - throw new MoralisCoreError({ - code: CoreErrorCode.NOT_INITIALIZED, - message: 'Default instance of MoralisCore is not set', - }); - } - return this.core; - } - - public static setDefault(core: MoralisCore) { - if (this.core) { - throw new MoralisCoreError({ - code: CoreErrorCode.ALREADY_INITIALIZED, - message: 'Default instance of MoralisCore is already set', - }); - } - this.core = core; - } -} diff --git a/packages/common/core/src/controllers/LoggerController.ts b/packages/common/core/src/controllers/LoggerController.ts index 5ee45732f2..751312bf42 100644 --- a/packages/common/core/src/controllers/LoggerController.ts +++ b/packages/common/core/src/controllers/LoggerController.ts @@ -2,7 +2,7 @@ import { isMoralisError } from '../Error/isMoralisError'; import { CoreConfig, LogLevel } from '../Config/CoreConfig'; import { Config } from '../Config'; -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; type Details = Record; @@ -22,7 +22,7 @@ const logLevelMap: Record = { * It will show only logs up to the specified `logLevel` in the MoralisConfig */ export class LoggerController { - public static create(moduleName: string, core: MoralisCore): LoggerController { + public static create(moduleName: string, core: Core): LoggerController { return new LoggerController(moduleName, core.config); } diff --git a/packages/common/core/src/controllers/RequestController/RequestController.ts b/packages/common/core/src/controllers/RequestController/RequestController.ts index 2edb6fd227..80d39ecd8e 100644 --- a/packages/common/core/src/controllers/RequestController/RequestController.ts +++ b/packages/common/core/src/controllers/RequestController/RequestController.ts @@ -1,7 +1,7 @@ import { AxiosError, AxiosRequestConfig } from 'axios'; -import { CoreErrorCode, MoralisCoreError } from '../../Error'; +import { CoreErrorCode, CoreError } from '../../Error'; import { AxiosRetry, AxiosRetryConfig } from '../AxiosRetry'; -import { MoralisCore } from '../../MoralisCore'; +import { Core } from '../../Core'; import { LoggerController } from '../LoggerController'; import { getMessageFromApiRequestError, isApiRequestError } from './ApiRequestError'; @@ -14,7 +14,7 @@ export interface RequestOptions { * compatible with browser, nodejJs and react-native */ export class RequestController { - public static create(core: MoralisCore): RequestController { + public static create(core: Core): RequestController { return new RequestController(core.logger); } @@ -63,12 +63,12 @@ export class RequestController { } } - private makeError(error: unknown): MoralisCoreError { + private makeError(error: unknown): CoreError { if (isApiRequestError(error)) { const { status, statusText } = error.response; const apiMessage = getMessageFromApiRequestError(error); - return new MoralisCoreError({ + return new CoreError({ code: CoreErrorCode.REQUEST_ERROR, message: `Request failed, ${statusText}(${status}): ${apiMessage}`, cause: error, @@ -81,7 +81,7 @@ export class RequestController { const err = error instanceof Error ? error : new Error(`${error}`); - return new MoralisCoreError({ + return new CoreError({ code: CoreErrorCode.REQUEST_ERROR, message: `Request failed: ${err.message}`, cause: err, diff --git a/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts index dad1c7b633..49b8391337 100644 --- a/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts +++ b/packages/common/core/src/dataTypes/BigNumber/BigNumberFormatter.ts @@ -1,9 +1,9 @@ -import { CoreErrorCode, MoralisCoreError } from '../../Error'; +import { CoreErrorCode, CoreError } from '../../Error'; export class BigNumberFormatter { public static toDecimal(value: bigint, decimals: number): string { if (decimals < 0) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.BIG_NUMBER_ERROR, message: 'Invalid decimals', }); diff --git a/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts b/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts index 3f4c0b0e52..15f7e99727 100644 --- a/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts +++ b/packages/common/core/src/dataTypes/BigNumber/BigNumberParser.ts @@ -1,4 +1,4 @@ -import { CoreErrorCode, MoralisCoreError } from '../../Error'; +import { CoreErrorCode, CoreError } from '../../Error'; /** * Valid input types for a BigNumber. This can be a number, string, or bigint. @@ -105,7 +105,7 @@ function getMultiplier(decimals: number): bigint { } function createError(message: string): Error { - return new MoralisCoreError({ + return new CoreError({ code: CoreErrorCode.BIG_NUMBER_ERROR, message, }); diff --git a/packages/common/core/src/index.ts b/packages/common/core/src/index.ts index fa371d4336..4093b0dd07 100644 --- a/packages/common/core/src/index.ts +++ b/packages/common/core/src/index.ts @@ -1,7 +1,7 @@ -import { MoralisCore } from './MoralisCore'; +import { Core } from './Core'; -export * from './MoralisCore'; -export * from './MoralisCoreProvider'; +export * from './Core'; +export * from './CoreProvider'; export * from './Modules'; export * from './Error'; export * from './Config'; @@ -12,4 +12,4 @@ export * from './operations'; export * from './utils'; export * from './Assert'; -export default MoralisCore; +export default Core; diff --git a/packages/common/core/src/operations/Operation.ts b/packages/common/core/src/operations/Operation.ts index 734d497b67..e201b82417 100644 --- a/packages/common/core/src/operations/Operation.ts +++ b/packages/common/core/src/operations/Operation.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '../MoralisCore'; +import { Core } from '../Core'; export interface Operation { name: string; @@ -11,11 +11,11 @@ export interface Operation { bodyParamNames?: (keyof Request)[]; firstPageIndex?: number; - getRequestUrlParams(request: Request, core: MoralisCore): OperationRequestUrlParams; - getRequestBody?(request: Request, core: MoralisCore): OperationRequestBody; - deserializeResponse(jsonResponse: JSONResponse, request: Request, core: MoralisCore): Response; - serializeRequest(request: Request, core: MoralisCore): JSONRequest; - deserializeRequest(jsonRequest: JSONRequest, core: MoralisCore): Request; + getRequestUrlParams(request: Request, core: Core): OperationRequestUrlParams; + getRequestBody?(request: Request, core: Core): OperationRequestBody; + deserializeResponse(jsonResponse: JSONResponse, request: Request, core: Core): Response; + serializeRequest(request: Request, core: Core): JSONRequest; + deserializeRequest(jsonRequest: JSONRequest, core: Core): Request; } export type OperationRequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'; diff --git a/packages/common/evmUtils/src/CommonEvmUtils.ts b/packages/common/evmUtils/src/CommonEvmUtils.ts index 624c8910e5..aeef53abe6 100644 --- a/packages/common/evmUtils/src/CommonEvmUtils.ts +++ b/packages/common/evmUtils/src/CommonEvmUtils.ts @@ -1,14 +1,14 @@ -import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/common-core'; +import Core, { Module, CoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfigSetup } from './config/CommonEvmUtilsConfigSetup'; export class CommonEvmUtils extends Module { public static readonly moduleName = 'evmUtils'; - public static create(core?: MoralisCore): CommonEvmUtils { - return new CommonEvmUtils(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): CommonEvmUtils { + return new CommonEvmUtils(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(CommonEvmUtils.moduleName, core); } diff --git a/packages/common/evmUtils/src/EvmChainResolver.ts b/packages/common/evmUtils/src/EvmChainResolver.ts index 119580be75..ee1cb27c2d 100644 --- a/packages/common/evmUtils/src/EvmChainResolver.ts +++ b/packages/common/evmUtils/src/EvmChainResolver.ts @@ -1,9 +1,9 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from './config/CommonEvmUtilsConfig'; import { EvmChain, EvmChainish } from './dataTypes'; export class EvmChainResolver { - public static resolve(chain: EvmChainish | undefined, core: MoralisCore): EvmChain { + public static resolve(chain: EvmChainish | undefined, core: Core): EvmChain { if (chain) { return EvmChain.create(chain, core); } diff --git a/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts b/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts index 651958a44a..5c172227d5 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20/Erc20.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, maybe, MoralisCoreProvider } from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, maybe, CoreProvider } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { Erc20Input, Erc20Data } from './types'; @@ -24,21 +24,21 @@ export class Erc20Token implements MoralisDataObject { * const token = Erc20Token.create(value); * ``` */ - public static create(value: Erc20Tokenish, core?: MoralisCore) { + public static create(value: Erc20Tokenish, core?: Core) { if (value instanceof Erc20Token) { return value; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new Erc20Token(value, finalCore); } private readonly _value: Erc20Data; - private constructor(value: Erc20Input, core: MoralisCore) { + private constructor(value: Erc20Input, core: Core) { this._value = Erc20Token.parse(value, core); } - static parse = (value: Erc20Input, core: MoralisCore): Erc20Data => ({ + static parse = (value: Erc20Input, core: Core): Erc20Data => ({ decimals: +value.decimals, name: value.name, symbol: value.symbol, diff --git a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts index 1d237bf7fb..9a143948ef 100644 --- a/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts +++ b/packages/common/evmUtils/src/dataTypes/Erc20Value/Erc20Value.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/common-core'; +import { BigNumber, BigNumberish, CoreErrorCode, CoreError, MoralisData } from '@moralisweb3/common-core'; import { Erc20Token, Erc20Tokenish } from '../Erc20/Erc20'; const EVM_ERC20_DEFAULT_DECIMALS = 18; @@ -48,7 +48,7 @@ export class Erc20Value implements MoralisData { * @param options - The options for the token * @example Erc20Value.create(1000, { decimals: 3 }); * @returns The created value - * @throws MoralisCoreError if the value is invalid + * @throws CoreError if the value is invalid */ static create(value: Erc20Valueish, options?: Erc20Options): Erc20Value { if (value instanceof Erc20Value) { @@ -83,7 +83,7 @@ export class Erc20Value implements MoralisData { token?: Erc20Tokenish; }): Erc20ValueData => { if (token && token.decimals && +token.decimals !== +decimals) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_DATA, message: 'Decimals do not match', }); diff --git a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts index e0da4c8603..ee05b33eba 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { EvmAddress } from './EvmAddress'; import { setupEvmUtils } from '../../test/setup'; @@ -8,7 +8,7 @@ const TEST_ADDRESS_LOWERCASE = TEST_ADDRESS_CHECKSUM.toLowerCase(); const TEST_INVALID_ADDRESS = '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96000'; describe('EvmAddress', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupEvmUtils(); diff --git a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts index 8a825d31ef..e7568e3380 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmAddress/EvmAddress.ts @@ -1,10 +1,10 @@ import { - MoralisCore, - MoralisCoreProvider, + Core, + CoreProvider, EvmAddressFormat, Config, CoreErrorCode, - MoralisCoreError, + CoreError, MoralisData, } from '@moralisweb3/common-core'; import { getAddress, isAddress } from '@ethersproject/address'; @@ -50,11 +50,11 @@ export class EvmAddress implements MoralisData { * const address = EvmAddress.ZERO_ADDRESS * ``` */ - public static create(address: EvmAddressish, core?: MoralisCore) { + public static create(address: EvmAddressish, core?: Core) { if (address instanceof EvmAddress) { return address; } - const finalCore = core || MoralisCoreProvider.getDefault(); + const finalCore = core || CoreProvider.getDefault(); return new EvmAddress(address, finalCore.config); } @@ -69,7 +69,7 @@ export class EvmAddress implements MoralisData { private static parse(address: EvmAddressInput) { if (!isAddress(address)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: 'Invalid address provided', }); @@ -109,7 +109,7 @@ export class EvmAddress implements MoralisData { return this.lowercase; } - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: 'Cannot format address, invalid config.formatAddress', }); diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts index a704d9cd8c..d9139122d5 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmBlock.ts @@ -1,9 +1,4 @@ -import MoralisCore, { - MoralisDataObject, - BigNumber, - dateInputToDate, - MoralisCoreProvider, -} from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, BigNumber, dateInputToDate, CoreProvider } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmTransaction } from '../EvmTransaction'; @@ -27,21 +22,21 @@ export class EvmBlock implements MoralisDataObject { * @param data - the EvmBlockish type * @example const transaction = EvmTransaction.create(data); */ - static create(data: EvmBlockish, core?: MoralisCore) { + static create(data: EvmBlockish, core?: Core) { if (data instanceof EvmBlock) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmBlock(data, finalCore); } private _data: EvmBlockData; - constructor(data: EvmBlockInput, core: MoralisCore) { + constructor(data: EvmBlockInput, core: Core) { this._data = EvmBlock.parse(data, core); } - static parse = (data: EvmBlockInput, core: MoralisCore): EvmBlockData => ({ + static parse = (data: EvmBlockInput, core: Core): EvmBlockData => ({ ...data, miner: EvmAddress.create(data.miner, core), timestamp: dateInputToDate(data.timestamp), diff --git a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts index 08da89f20e..6dc665ef6a 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmBlock/EvmSimpleBlock.ts @@ -1,9 +1,4 @@ -import MoralisCore, { - MoralisDataObject, - BigNumber, - dateInputToDate, - MoralisCoreProvider, -} from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, BigNumber, dateInputToDate, CoreProvider } from '@moralisweb3/common-core'; import { EvmChain } from '../EvmChain'; import { EvmBlockish } from './EvmBlock'; import { EvmSimpleBlockInput, EvmSimpleBlockData } from './types'; @@ -25,21 +20,21 @@ export class EvmSimpleBlock implements MoralisDataObject { * @param data - the EvmSimpleBlockish type * @example const transaction = EvmTransaction.create(data); */ - static create(data: EvmSimpleBlockish, core?: MoralisCore) { + static create(data: EvmSimpleBlockish, core?: Core) { if (data instanceof EvmSimpleBlock) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmSimpleBlock(data, finalCore); } private _data: EvmSimpleBlockData; - constructor(data: EvmSimpleBlockInput, core: MoralisCore) { + constructor(data: EvmSimpleBlockInput, core: Core) { this._data = EvmSimpleBlock.parse(data, core); } - static parse = (data: EvmSimpleBlockInput, core: MoralisCore): EvmSimpleBlockData => ({ + static parse = (data: EvmSimpleBlockInput, core: Core): EvmSimpleBlockData => ({ timestamp: dateInputToDate(data.timestamp), number: BigNumber.create(data.number), chain: EvmChain.create(data.chain, core), diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts index e1245fe2f0..abac577d37 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts @@ -1,9 +1,9 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { setupEvmUtils } from '../../test/setup'; import { EvmChain } from './EvmChain'; describe('EvmChain', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupEvmUtils(); diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts index 69faf36044..40f558496e 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChain.ts @@ -4,10 +4,10 @@ import { EvmChainish, InputChainId } from './EvmChainish'; import { EvmChainIdFormat, Config, - MoralisCoreProvider, + CoreProvider, MoralisData, assertUnreachable, - MoralisCore, + Core, EvmChainable, } from '@moralisweb3/common-core'; import { CommonEvmUtilsConfig } from '../../config/CommonEvmUtilsConfig'; @@ -166,11 +166,11 @@ export class EvmChain implements MoralisData, EvmChainable { * const chain = EvmChain.create("0x3") * ``` */ - public static create(chain: EvmChainish, core?: MoralisCore): EvmChain { + public static create(chain: EvmChainish, core?: Core): EvmChain { if (chain instanceof EvmChain) { return chain; } - const c = core || MoralisCoreProvider.getDefault(); + const c = core || CoreProvider.getDefault(); return new EvmChain(chain, c.config); } diff --git a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts index 370217ab75..84d0b6431a 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmChain/EvmChainParser.ts @@ -1,4 +1,4 @@ -import { CoreErrorCode, MoralisCoreError } from '@moralisweb3/common-core'; +import { CoreErrorCode, CoreError } from '@moralisweb3/common-core'; import { InputChainId } from './EvmChainish'; const INVALID_VALUES = ['0x', '0x0', '0', 0]; @@ -6,7 +6,7 @@ const INVALID_VALUES = ['0x', '0x0', '0', 0]; export class EvmChainParser { public static parse(chain: InputChainId): string { if (INVALID_VALUES.includes(chain)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: "Invalid provided chain, value must be a positive number, or a hex-string starting with '0x'", }); @@ -24,7 +24,7 @@ export class EvmChainParser { } return `0x${parsed.toString(16)}`; } catch (error) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: "Invalid provided chain, value must be a positive number, or a hex-string starting with '0x'", }); @@ -32,7 +32,7 @@ export class EvmChainParser { } if (chain <= 0) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: "Invalid provided chain, value must be a positive number, or a hex-string starting with '0x'", }); diff --git a/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts b/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts index 0a158de060..c208eb0f27 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmEvent/EvmEvent.ts @@ -1,11 +1,4 @@ -import { - MoralisCore, - MoralisDataObject, - maybe, - BigNumber, - dateInputToDate, - MoralisCoreProvider, -} from '@moralisweb3/common-core'; +import { Core, MoralisDataObject, maybe, BigNumber, dateInputToDate, CoreProvider } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; @@ -33,17 +26,17 @@ export class EvmEvent implements MoralisDataObject { * const event = EvmEventish.create(data); *``` */ - static create(data: EvmEventish, core?: MoralisCore) { + static create(data: EvmEventish, core?: Core) { if (data instanceof EvmEvent) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmEvent(EvmEvent.parse(data, finalCore)); } private constructor(private readonly _data: EvmEventData) {} - static parse = (data: EvmEventInput, core: MoralisCore): EvmEventData => ({ + static parse = (data: EvmEventInput, core: Core): EvmEventData => ({ ...data, chain: EvmChain.create(data.chain, core), address: EvmAddress.create(data.address, core), diff --git a/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts b/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts index 2a8f005fad..b986893aea 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNative/EvmNative.ts @@ -1,4 +1,4 @@ -import { BigNumber, BigNumberish, CoreErrorCode, MoralisCoreError, MoralisData } from '@moralisweb3/common-core'; +import { BigNumber, BigNumberish, CoreErrorCode, CoreError, MoralisData } from '@moralisweb3/common-core'; /** * Type containing valid EVM native units @@ -93,7 +93,7 @@ export class EvmNative implements MoralisData { decimals = unit; } else { if (unitToDecimals[unit] == null) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: 'Unit should be a decimal number or valid EvmNativeUnit string', }); diff --git a/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts b/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts index d150dd2285..f291f972c3 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNft/EvmNft.ts @@ -1,12 +1,12 @@ -import MoralisCore, { +import Core, { MoralisDataObject, MoralisDataObjectValue, CoreErrorCode, - MoralisCoreError, + CoreError, maybe, BigNumber, dateInputToDate, - MoralisCoreProvider, + CoreProvider, } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; @@ -28,28 +28,28 @@ export class EvmNft implements MoralisDataObject { * Create a new instance of EvmNft from any valid address input * * @param data - the EvmNftish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const nft = EvmNft.create(data); * ``` * @returns an instance of EvmNft */ - static create(data: EvmNftish, core?: MoralisCore) { + static create(data: EvmNftish, core?: Core) { if (data instanceof EvmNft) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmNft(data, finalCore); } private _data: EvmNftData; - constructor(data: EvmNftInput, core: MoralisCore) { + constructor(data: EvmNftInput, core: Core) { this._data = EvmNft.parse(data, core); } - static parse = (data: EvmNftInput, core: MoralisCore): EvmNftData => ({ + static parse = (data: EvmNftInput, core: Core): EvmNftData => ({ ...data, chain: EvmChain.create(data.chain, core), contractType: maybe(data.contractType), @@ -72,13 +72,13 @@ export class EvmNft implements MoralisDataObject { * * @param value - the new value for the NFT metadata * @returns the parsed value of the JSON string - * @throws {MoralisCoreError} if the value is not a valid JSON string + * @throws {CoreError} if the value is not a valid JSON string */ private static validateMetadata = (value: string): MoralisDataObjectValue => { try { return JSON.parse(value); } catch (error) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: 'Invalid metadata provided, cannot parse the value to JSON', }); diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts index a638945c5a..df13c546b9 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { EvmNftCollection } from './EvmNftCollection'; import { setupEvmUtils } from '../../test/setup'; import { EvmNftCollectionInput } from './types'; @@ -12,7 +12,7 @@ const exampleInput: EvmNftCollectionInput = { }; describe('EvmNftCollection', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupEvmUtils(); diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts index f518af0cdf..041a4672b5 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftCollection/EvmNftCollection.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisDataObject, MoralisCoreProvider, maybe } from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, CoreProvider, maybe } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNftCollectionData, EvmNftCollectionInput } from './types'; @@ -20,21 +20,21 @@ export class EvmNftCollection implements MoralisDataObject { * @param data - the EvmNftCollectionish type * @example const collection = EvmTransaction.create(data); */ - static create(data: EvmNftCollectionish, core?: MoralisCore) { + static create(data: EvmNftCollectionish, core?: Core) { if (data instanceof EvmNftCollection) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmNftCollection(data, finalCore); } private _data: EvmNftCollectionData; - constructor(data: EvmNftCollectionInput, core: MoralisCore) { + constructor(data: EvmNftCollectionInput, core: Core) { this._data = EvmNftCollection.parse(data, core); } - static parse = (data: EvmNftCollectionInput, core: MoralisCore): EvmNftCollectionData => ({ + static parse = (data: EvmNftCollectionInput, core: Core): EvmNftCollectionData => ({ ...data, tokenAddress: EvmAddress.create(data.tokenAddress, core), chain: EvmChain.create(data.chain, core), diff --git a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts index 4afa000478..6412a5685d 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmNftTransfer/EvmNftTransfer.ts @@ -1,10 +1,4 @@ -import MoralisCore, { - MoralisDataObject, - maybe, - MoralisCoreProvider, - BigNumber, - dateInputToDate, -} from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, maybe, CoreProvider, BigNumber, dateInputToDate } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; @@ -30,22 +24,22 @@ export class EvmNftTransfer implements MoralisDataObject { * const transfer = EvmNftTransfer.create(data); *``` */ - static create(data: EvmNftTransferish, core?: MoralisCore) { + static create(data: EvmNftTransferish, core?: Core) { if (data instanceof EvmNftTransfer) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmNftTransfer(data, finalCore); } protected _data: EvmNftTransferData; - constructor(data: EvmNftTransferInput, core: MoralisCore) { + constructor(data: EvmNftTransferInput, core: Core) { this._data = EvmNftTransfer.parse(data, core); } - static parse = (data: EvmNftTransferInput, core: MoralisCore): EvmNftTransferData => ({ + static parse = (data: EvmNftTransferInput, core: Core): EvmNftTransferData => ({ ...data, chain: EvmChain.create(data.chain, core), amount: maybe(data.amount, (amount) => +amount), diff --git a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts index 8a554216bf..e6ab387b8a 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmSignature/EvmSignature.test.ts @@ -1,4 +1,4 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { EvmSignature, EvmSignatureish } from './EvmSignature'; import { setupEvmUtils } from '../../test/setup'; @@ -77,7 +77,7 @@ const validInputs: [EvmSignatureish, string][] = [ ]; describe('EvmAddress', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupEvmUtils(); diff --git a/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts b/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts index e47d2069f1..f1006ae05f 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.ts @@ -1,10 +1,4 @@ -import MoralisCore, { - MoralisDataObject, - maybe, - BigNumber, - MoralisCoreProvider, - dateInputToDate, -} from '@moralisweb3/common-core'; +import Core, { MoralisDataObject, maybe, BigNumber, CoreProvider, dateInputToDate } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmNative } from '../EvmNative'; @@ -34,21 +28,21 @@ export class EvmTransaction implements MoralisDataObject { * const transaction = EvmTransaction.create(data); *``` */ - static create(data: EvmTransactionish, core?: MoralisCore) { + static create(data: EvmTransactionish, core?: Core) { if (data instanceof EvmTransaction) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmTransaction(data, finalCore); } private _data: EvmTransactionData; - constructor(data: EvmTransactionInput, core: MoralisCore) { + constructor(data: EvmTransactionInput, core: Core) { this._data = EvmTransaction.parse(data, core); } - static parse = (data: EvmTransactionInput, core: MoralisCore): EvmTransactionData => ({ + static parse = (data: EvmTransactionInput, core: Core): EvmTransactionData => ({ from: EvmAddress.create(data.from, core), to: maybe(data.to, (to) => EvmAddress.create(to, core)), nonce: maybe(data.nonce, BigNumber.create), diff --git a/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts b/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts index 872ea7d8b5..a2d1fd350c 100644 --- a/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts +++ b/packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress } from '../EvmAddress'; import { EvmChain } from '../EvmChain'; import { EvmTransactionLogData, EvmTransactionLogInput } from './types'; @@ -22,23 +22,23 @@ export class EvmTransactionLog implements MoralisDataObject { * const log = EvmTransactionLog.create(value, core); * ``` * @param value - A valid EvmTransactionLogish - * @param core - The MoralisCore instance + * @param core - The Core instance */ - static create(value: EvmTransactionLogish, core?: MoralisCore) { + static create(value: EvmTransactionLogish, core?: Core) { if (value instanceof EvmTransactionLog) { return value; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmTransactionLog(value, finalCore); } private _value; - constructor(value: EvmTransactionLogInput, core: MoralisCore) { + constructor(value: EvmTransactionLogInput, core: Core) { this._value = EvmTransactionLog.parse(value, core); } - static parse(value: EvmTransactionLogInput, core: MoralisCore): EvmTransactionLogData { + static parse(value: EvmTransactionLogInput, core: Core): EvmTransactionLogData { return { chain: EvmChain.create(value.chain, core), logIndex: maybe(value.logIndex, (index) => +index), diff --git a/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts b/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts index 01d69e9a5a..a524e09fba 100644 --- a/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts +++ b/packages/common/evmUtils/src/operations/token/getWalletTokenTransfersOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, PaginatedOperation, toCamelCase, BigNumber, maybe } from '@moralisweb3/common-core'; +import { Core, Camelize, PaginatedOperation, toCamelCase, BigNumber, maybe } from '@moralisweb3/common-core'; import { Erc20Transfer, EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '../../dataTypes'; import { EvmChainResolver } from '../../EvmChainResolver'; import { operations } from '../openapi'; @@ -42,7 +42,7 @@ export const getWalletTokenTransfersOperation: PaginatedOperation< // Methods -function getRequestUrlParams(request: GetWalletTokenTransfersRequest, core: MoralisCore) { +function getRequestUrlParams(request: GetWalletTokenTransfersRequest, core: Core) { return { address: String(request.address), chain: EvmChainResolver.resolve(request.chain, core).apiHex, @@ -58,7 +58,7 @@ function getRequestUrlParams(request: GetWalletTokenTransfersRequest, core: Mora function deserializeResponse( jsonResponse: GetWalletTokenTransfersJSONResponse, request: GetWalletTokenTransfersRequest, - core: MoralisCore, + core: Core, ) { return (jsonResponse.result || []).map((transfer) => { return Erc20Transfer.create({ @@ -73,7 +73,7 @@ function deserializeResponse( }); } -function serializeRequest(request: GetWalletTokenTransfersRequest, core: MoralisCore) { +function serializeRequest(request: GetWalletTokenTransfersRequest, core: Core) { return { address: request.address.toString(), chain: EvmChainResolver.resolve(request.chain, core).apiHex, @@ -87,7 +87,7 @@ function serializeRequest(request: GetWalletTokenTransfersRequest, core: Moralis function deserializeRequest( jsonRequest: GetWalletTokenTransfersJSONRequest, - core: MoralisCore, + core: Core, ): GetWalletTokenTransfersRequest { return { address: EvmAddress.create(jsonRequest.address, core), diff --git a/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts b/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts index 708bc15e73..3f20eb6343 100644 --- a/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts +++ b/packages/common/evmUtils/src/operations/utils/runContractFunctionOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; +import { Core, Camelize, Operation } from '@moralisweb3/common-core'; import { EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '../../dataTypes'; import { EvmChainResolver } from '../../EvmChainResolver'; import { operations } from '../openapi'; @@ -48,7 +48,7 @@ export const runContractFunctionOperation: Operation< // Methods -function getRequestUrlParams(request: RunContractFunctionRequest, core: MoralisCore) { +function getRequestUrlParams(request: RunContractFunctionRequest, core: Core) { return { address: EvmAddress.create(request.address, core).checksum, chain: EvmChainResolver.resolve(request.chain, core).apiHex, @@ -69,7 +69,7 @@ function deserializeResponse(jsonResponse: RunContractFunctionJSONResponse) { return jsonResponse; } -function serializeRequest(request: RunContractFunctionRequest, core: MoralisCore) { +function serializeRequest(request: RunContractFunctionRequest, core: Core) { return { address: EvmAddress.create(request.address, core).toString(), chain: EvmChainResolver.resolve(request.chain, core).apiHex, @@ -81,10 +81,7 @@ function serializeRequest(request: RunContractFunctionRequest, core: MoralisCore }; } -function deserializeRequest( - jsonRequest: RunContractFunctionJSONRequest, - core: MoralisCore, -): RunContractFunctionRequest { +function deserializeRequest(jsonRequest: RunContractFunctionJSONRequest, core: Core): RunContractFunctionRequest { return { address: EvmAddress.create(jsonRequest.address, core), chain: EvmChain.create(jsonRequest.chain, core), diff --git a/packages/common/evmUtils/src/test/setup.ts b/packages/common/evmUtils/src/test/setup.ts index caa5091fbc..a2d352a042 100644 --- a/packages/common/evmUtils/src/test/setup.ts +++ b/packages/common/evmUtils/src/test/setup.ts @@ -1,11 +1,11 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '../CommonEvmUtils'; export const setupEvmUtils = () => { - const core = MoralisCore.create(); + const core = Core.create(); const commonEvmUtils = CommonEvmUtils.create(core); core.registerModule(commonEvmUtils); - MoralisCoreProvider.setDefault(core); + CoreProvider.setDefault(core); return core; }; diff --git a/packages/common/solUtils/src/CommonSolUtils.ts b/packages/common/solUtils/src/CommonSolUtils.ts index b4afb676f1..4f78d74a89 100644 --- a/packages/common/solUtils/src/CommonSolUtils.ts +++ b/packages/common/solUtils/src/CommonSolUtils.ts @@ -1,14 +1,14 @@ -import MoralisCore, { Module, MoralisCoreProvider } from '@moralisweb3/common-core'; +import Core, { Module, CoreProvider } from '@moralisweb3/common-core'; import { CommonSolUtilsConfigSetup } from './config'; export class CommonSolUtils extends Module { public static readonly moduleName = 'solUtils'; - public static create(core?: MoralisCore): CommonSolUtils { - return new CommonSolUtils(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): CommonSolUtils { + return new CommonSolUtils(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(CommonSolUtils.moduleName, core); } diff --git a/packages/common/solUtils/src/SolNetworkResolver.ts b/packages/common/solUtils/src/SolNetworkResolver.ts index 237a2110c0..af21420aff 100644 --- a/packages/common/solUtils/src/SolNetworkResolver.ts +++ b/packages/common/solUtils/src/SolNetworkResolver.ts @@ -1,9 +1,9 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { CommonSolUtilsConfig } from './config/CommonSolUtilsConfig'; import { SolNetwork, SolNetworkish, SolNetworkName } from './dataTypes'; export class SolNetworkResolver { - public static resolve(network: SolNetworkish | undefined, core: MoralisCore): SolNetworkName { + public static resolve(network: SolNetworkish | undefined, core: Core): SolNetworkName { if (!network) { network = core.config.get(CommonSolUtilsConfig.defaultSolNetwork); } diff --git a/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts b/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts index 433d5b24a8..1f3332c1ad 100644 --- a/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts +++ b/packages/common/solUtils/src/dataTypes/SolAddress/SolAddress.ts @@ -1,4 +1,4 @@ -import { CoreErrorCode, MoralisCoreError, MoralisData, MoralisDataFormatted } from '@moralisweb3/common-core'; +import { CoreErrorCode, CoreError, MoralisData, MoralisDataFormatted } from '@moralisweb3/common-core'; import { PublicKey } from '@solana/web3.js'; /** @@ -33,7 +33,7 @@ export class SolAddress implements MoralisData { const publicKey = new PublicKey(address); return publicKey.toBase58(); } catch (e) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: `Invalid Solana address provided: ${address}`, cause: e, diff --git a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts index 739fc6909c..1f9dd98a09 100644 --- a/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts +++ b/packages/common/solUtils/src/dataTypes/SolNative/SolNative.ts @@ -2,7 +2,7 @@ import { MoralisData, MoralisDataFormatted, CoreErrorCode, - MoralisCoreError, + CoreError, BigNumberish, BigNumber, } from '@moralisweb3/common-core'; @@ -49,7 +49,7 @@ export class SolNative implements MoralisData { } else if (unitToDecimals[unit] !== undefined) { decimal = unitToDecimals[unit]; } else { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: `Not supported Solana unit: ${unit}`, }); diff --git a/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts b/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts index c5148436d8..f3548c34f0 100644 --- a/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts +++ b/packages/common/solUtils/src/dataTypes/SolNetwork/SolNetwork.ts @@ -1,4 +1,4 @@ -import { MoralisData, MoralisDataFormatted, CoreErrorCode, MoralisCoreError } from '@moralisweb3/common-core'; +import { MoralisData, MoralisDataFormatted, CoreErrorCode, CoreError } from '@moralisweb3/common-core'; const solNetworkNames = ['mainnet', 'devnet'] as const; @@ -65,7 +65,7 @@ export class SolNetwork implements MoralisData { private static parse(network: SolNetworkNameish): SolNetworkName { if (typeof network === 'string') { if (!solNetworkNames.includes(network as SolNetworkName)) { - throw new MoralisCoreError({ + throw new CoreError({ code: CoreErrorCode.INVALID_ARGUMENT, message: `Solana network is not supported: ${network}`, }); diff --git a/packages/common/solUtils/src/operations/account/getBalanceOperation.ts b/packages/common/solUtils/src/operations/account/getBalanceOperation.ts index cea19a7998..1298b2a462 100644 --- a/packages/common/solUtils/src/operations/account/getBalanceOperation.ts +++ b/packages/common/solUtils/src/operations/account/getBalanceOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; +import { Core, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNative, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; @@ -40,7 +40,7 @@ export const getBalanceOperation: Operation< // Methods -function getRequestUrlParams(request: GetBalanceRequest, core: MoralisCore) { +function getRequestUrlParams(request: GetBalanceRequest, core: Core) { return { network: SolNetworkResolver.resolve(request.network, core), address: SolAddress.create(request.address).address, @@ -51,7 +51,7 @@ function deserializeResponse(jsonResponse: GetBalanceJSONResponse) { return SolNative.create(jsonResponse.lamports); } -function serializeRequest(request: GetBalanceRequest, core: MoralisCore) { +function serializeRequest(request: GetBalanceRequest, core: Core) { return { address: request.address.toString(), network: SolNetworkResolver.resolve(request.network, core), diff --git a/packages/common/solUtils/src/operations/account/getNFTsOperation.ts b/packages/common/solUtils/src/operations/account/getNFTsOperation.ts index aef037e16f..be9e8532aa 100644 --- a/packages/common/solUtils/src/operations/account/getNFTsOperation.ts +++ b/packages/common/solUtils/src/operations/account/getNFTsOperation.ts @@ -1,4 +1,4 @@ -import { MoralisCore, Camelize, Operation } from '@moralisweb3/common-core'; +import { Core, Camelize, Operation } from '@moralisweb3/common-core'; import { SolAddress, SolAddressish, SolNetwork, SolNetworkish } from '../../dataTypes'; import { SolNetworkResolver } from '../../SolNetworkResolver'; import { operations } from '../openapi'; @@ -35,7 +35,7 @@ export const getNFTsOperation: Operation ({ name, input })); describe('EvmStream', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts index 61eead15aa..a408412e1e 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStream/EvmStream.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmChain } from '@moralisweb3/common-evm-utils'; import { EvmStreamData, EvmStreamInput, EvmStreamJSON } from './types'; @@ -12,7 +12,7 @@ export type EvmStreamish = EvmStreamInput | EvmStream; export class EvmStream implements MoralisDataObject { private _data: EvmStreamData; - constructor(data: EvmStreamInput, core: MoralisCore) { + constructor(data: EvmStreamInput, core: Core) { this._data = EvmStream.parse(data, core); } @@ -20,22 +20,22 @@ export class EvmStream implements MoralisDataObject { * Create a new instance of EvmStream * * @param data - the EvmStreamish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const evmStream = EvmStream.create(data); * ``` * @returns an instance of EvmStream */ - static create(data: EvmStreamish, core?: MoralisCore) { + static create(data: EvmStreamish, core?: Core) { if (data instanceof EvmStream) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmStream(data, finalCore); } - private static parse = (data: EvmStreamInput, core: MoralisCore): EvmStreamData => { + private static parse = (data: EvmStreamInput, core: Core): EvmStreamData => { return { ...data, chains: data.chainIds.map((chainId) => EvmChain.create(chainId, core)), diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts index 0c43ca3af8..cc42575d7b 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { EvmStreamResult } from './EvmStreamResult'; import { mockEvmStreamResult } from './EvmStreamResult.mock'; @@ -6,7 +6,7 @@ import { mockEvmStreamResult } from './EvmStreamResult.mock'; const testsInputs = Object.entries(mockEvmStreamResult).map(([name, input]) => ({ name, input })); describe('EvmStreamResult', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts index 551bbe7236..83e52b7522 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResult.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmStreamResultFormatter } from './EvmStreamResultFormatter'; import { EvmStreamResultParser } from './EvmStreamResultParser'; import { EvmStreamResultData, EvmStreamResultInput } from './types'; @@ -16,28 +16,28 @@ export class EvmStreamResult implements MoralisDataObject { * Create a new instance of EvmStreamResult * * @param data - the EvmStreamResultish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const evmStreamResult = EvmStreamResult.create(data); * ``` * @returns an instance of EvmStreamResult */ - static create(data: EvmStreamResultish, core?: MoralisCore) { + static create(data: EvmStreamResultish, core?: Core) { if (data instanceof EvmStreamResult) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new EvmStreamResult(data, finalCore); } private _data: EvmStreamResultData; - constructor(data: EvmStreamResultInput, core: MoralisCore) { + constructor(data: EvmStreamResultInput, core: Core) { this._data = EvmStreamResult.parse(data, core); } - private static parse = (data: EvmStreamResultInput, core: MoralisCore): EvmStreamResultData => + private static parse = (data: EvmStreamResultInput, core: Core): EvmStreamResultData => EvmStreamResultParser.parse(data, core); /** diff --git a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts index 7ee1ca50b0..30772887c0 100644 --- a/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts +++ b/packages/common/streamsUtils/src/dataTypes/EvmStreamResult/EvmStreamResultParser.ts @@ -1,5 +1,5 @@ /* eslint-disable etc/no-commented-out-code */ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { EvmSimpleBlock, EvmChain } from '@moralisweb3/common-evm-utils'; import { Block, @@ -22,7 +22,7 @@ import { StreamEvmTransactionLog } from '../StreamEvmTransactionLog/StreamEvmTra import { EvmStreamResultData, EvmStreamResultInput } from './types'; export class EvmStreamResultParser { - static parse = (value: EvmStreamResultInput, core: MoralisCore): EvmStreamResultData => { + static parse = (value: EvmStreamResultInput, core: Core): EvmStreamResultData => { const chain = this.parseChainId(value.chainId, core); return { @@ -43,7 +43,7 @@ export class EvmStreamResultParser { }; }; - static parseChainId(value: string, core: MoralisCore) { + static parseChainId(value: string, core: Core) { // Only needed for the initial test-response where we get an empty string as chain return value === '' ? EvmChain.ETHEREUM : EvmChain.create(value, core); } diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts index b0e8c269fb..6d3251bc0d 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc1155Approval } from './StreamErc1155Approval'; import { mockStreamErc1155Approval } from './StreamErc1155Approval.mock'; @@ -6,7 +6,7 @@ import { mockStreamErc1155Approval } from './StreamErc1155Approval.mock'; const testsInputs = Object.entries(mockStreamErc1155Approval).map(([name, input]) => ({ name, input })); describe('StreamErc1155Approval', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts index 01800c9a86..9e17cae444 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc1155Approval/StreamErc1155Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc1155ApprovalData, StreamErc1155ApprovalInput, StreamErc1155ApprovalJSON } from './types'; @@ -14,28 +14,28 @@ export class StreamErc1155Approval implements MoralisDataObject { * Create a new instance of StreamErc1155Approval * * @param data - the StreamErc1155Approvalish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const evmNftApproval = StreamErc1155Approval.create(data); * ``` * @returns an instance of StreamErc1155Approval */ - static create(data: StreamErc1155Approvalish, core?: MoralisCore) { + static create(data: StreamErc1155Approvalish, core?: Core) { if (data instanceof StreamErc1155Approval) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamErc1155Approval(data, finalCore); } private _data: StreamErc1155ApprovalData; - constructor(data: StreamErc1155ApprovalInput, core: MoralisCore) { + constructor(data: StreamErc1155ApprovalInput, core: Core) { this._data = StreamErc1155Approval.parse(data, core); } - private static parse = (data: StreamErc1155ApprovalInput, core: MoralisCore): StreamErc1155ApprovalData => { + private static parse = (data: StreamErc1155ApprovalInput, core: Core): StreamErc1155ApprovalData => { const chain = EvmChain.create(data.chain, core); return { ...data, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts index 2c16eb1de9..f372942911 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc20Approval } from './StreamErc20Approval'; import { mockStreamErc20Approval } from './StreamErc20Approval.mock'; @@ -6,7 +6,7 @@ import { mockStreamErc20Approval } from './StreamErc20Approval.mock'; const testsInputs = Object.entries(mockStreamErc20Approval).map(([name, input]) => ({ name, input })); describe('StreamErc20Approval', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts index d9f95b1beb..77ef39a6cf 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Approval/StreamErc20Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { BigNumber, maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc20ApprovalData, StreamErc20ApprovalInput, StreamErc20ApprovalJSON } from './types'; @@ -14,28 +14,28 @@ export class StreamErc20Approval implements MoralisDataObject { * Create a new instance of StreamErc20Approval * * @param data - the StreamErc20Approvalish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const erc20Approval = StreamErc20Approval.create(data); * ``` * @returns an instance of StreamErc20Approval */ - static create(data: StreamErc20Approvalish, core?: MoralisCore) { + static create(data: StreamErc20Approvalish, core?: Core) { if (data instanceof StreamErc20Approval) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamErc20Approval(data, finalCore); } private _data: StreamErc20ApprovalData; - constructor(data: StreamErc20ApprovalInput, core: MoralisCore) { + constructor(data: StreamErc20ApprovalInput, core: Core) { this._data = StreamErc20Approval.parse(data, core); } - private static parse = (data: StreamErc20ApprovalInput, core: MoralisCore): StreamErc20ApprovalData => { + private static parse = (data: StreamErc20ApprovalInput, core: Core): StreamErc20ApprovalData => { const chain = EvmChain.create(data.chain, core); return { ...data, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts index 6748ca6563..8b25bd40d9 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc20Transfer } from './StreamErc20Transfer'; import { mockStreamErc20Transfer } from './StreamErc20Transfer.mock'; @@ -6,7 +6,7 @@ import { mockStreamErc20Transfer } from './StreamErc20Transfer.mock'; const testsInputs = Object.entries(mockStreamErc20Transfer).map(([name, input]) => ({ name, input })); describe('StreamErc20Transfer', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts index 8196eb39e0..16b7cf01f9 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc20Transfer/StreamErc20Transfer.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { BigNumber, maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc20TransferData, StreamErc20TransferInput, StreamErc20TransferJSON } from './types'; @@ -12,7 +12,7 @@ export type StreamErc20Transferish = StreamErc20TransferInput | StreamErc20Trans export class StreamErc20Transfer implements MoralisDataObject { private _data: StreamErc20TransferData; - constructor(data: StreamErc20TransferInput, core: MoralisCore) { + constructor(data: StreamErc20TransferInput, core: Core) { this._data = StreamErc20Transfer.parse(data, core); } @@ -20,22 +20,22 @@ export class StreamErc20Transfer implements MoralisDataObject { * Create a new instance of StreamErc20Transfer * * @param data - the StreamErc20Transferish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const erc20Transfer = StreamErc20Transfer.create(data); * ``` * @returns an instance of StreamErc20Transfer */ - static create(data: StreamErc20Transferish, core?: MoralisCore) { + static create(data: StreamErc20Transferish, core?: Core) { if (data instanceof StreamErc20Transfer) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamErc20Transfer(data, finalCore); } - private static parse = (data: StreamErc20TransferInput, core: MoralisCore): StreamErc20TransferData => { + private static parse = (data: StreamErc20TransferInput, core: Core): StreamErc20TransferData => { const chain = EvmChain.create(data.chain, core); return { ...data, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts index 9eb92dd837..ceee177318 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamErc721Approval } from './StreamErc721Approval'; import { mockStreamErc721Approval } from './StreamErc721Approval.mock'; @@ -6,7 +6,7 @@ import { mockStreamErc721Approval } from './StreamErc721Approval.mock'; const testsInputs = Object.entries(mockStreamErc721Approval).map(([name, input]) => ({ name, input })); describe('StreamErc721Approval', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts index 88ed559027..2d7d25ff29 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamErc721Approval/StreamErc721Approval.ts @@ -1,4 +1,4 @@ -import MoralisCore, { MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamErc721ApprovalData, StreamErc721ApprovalInput, StreamErc721ApprovalJSON } from './types'; @@ -14,28 +14,28 @@ export class StreamErc721Approval implements MoralisDataObject { * Create a new instance of StreamErc721Approval * * @param data - the StreamErc721Approvalish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const evmNftApproval = StreamErc721Approval.create(data); * ``` * @returns an instance of StreamErc721Approval */ - static create(data: StreamErc721Approvalish, core?: MoralisCore) { + static create(data: StreamErc721Approvalish, core?: Core) { if (data instanceof StreamErc721Approval) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamErc721Approval(data, finalCore); } private _data: StreamErc721ApprovalData; - constructor(data: StreamErc721ApprovalInput, core: MoralisCore) { + constructor(data: StreamErc721ApprovalInput, core: Core) { this._data = StreamErc721Approval.parse(data, core); } - private static parse = (data: StreamErc721ApprovalInput, core: MoralisCore): StreamErc721ApprovalData => { + private static parse = (data: StreamErc721ApprovalInput, core: Core): StreamErc721ApprovalData => { const chain = EvmChain.create(data.chain, core); return { ...data, diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts index bcddc9f1dc..bf8a1793fd 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmInternalTransaction } from './StreamEvmInternalTransaction'; import { mockStreamEvmInternalTransaction } from './StreamEvmInternalTransaction.mock'; @@ -6,7 +6,7 @@ import { mockStreamEvmInternalTransaction } from './StreamEvmInternalTransaction const testsInputs = Object.entries(mockStreamEvmInternalTransaction).map(([name, input]) => ({ name, input })); describe('StreamEvmInternalTransaction', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts index 97b38fc7a3..8bafd6d905 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmInternalTransaction/StreamEvmInternalTransaction.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { BigNumber, maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmInternalTransactionData, @@ -16,7 +16,7 @@ export type StreamEvmInternalTransactionish = StreamEvmInternalTransactionInput export class StreamEvmInternalTransaction implements MoralisDataObject { private _data: StreamEvmInternalTransactionData; - constructor(data: StreamEvmInternalTransactionInput, core: MoralisCore) { + constructor(data: StreamEvmInternalTransactionInput, core: Core) { this._data = StreamEvmInternalTransaction.parse(data, core); } @@ -24,25 +24,22 @@ export class StreamEvmInternalTransaction implements MoralisDataObject { * Create a new instance of StreamEvmInternalTransactionish * * @param data - the StreamEvmInternalTransactionishish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const transaction = StreamEvmTransactionish.create(data); * ``` * @returns an instance of StreamEvmInternalTransaction */ - static create(data: StreamEvmInternalTransactionish, core?: MoralisCore) { + static create(data: StreamEvmInternalTransactionish, core?: Core) { if (data instanceof StreamEvmInternalTransaction) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamEvmInternalTransaction(data, finalCore); } - private static parse = ( - data: StreamEvmInternalTransactionInput, - core: MoralisCore, - ): StreamEvmInternalTransactionData => ({ + private static parse = (data: StreamEvmInternalTransactionInput, core: Core): StreamEvmInternalTransactionData => ({ ...data, chain: EvmChain.create(data.chain, core), from: maybe(data.from, (value) => EvmAddress.create(value, core)), diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts index 645122a382..7b9cef0cec 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmNftTransfer } from './StreamEvmNftTransfer'; import { mockStreamEvmNftTransferInput } from './StreamEvmNftTransfer.mock'; @@ -6,7 +6,7 @@ import { mockStreamEvmNftTransferInput } from './StreamEvmNftTransfer.mock'; const testsInputs = Object.entries(mockStreamEvmNftTransferInput).map(([name, input]) => ({ name, input })); describe('StreamEvmNftTransfer', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts index 330c15d912..aa4bcf4c35 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmNftTransfer/StreamEvmNftTransfer.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmNftTransferData, StreamEvmNftTransferInput, StreamEvmNftTransferJSON } from './types'; @@ -12,7 +12,7 @@ type StreamEvmNftTransferish = StreamEvmNftTransfer | StreamEvmNftTransferInput; export class StreamEvmNftTransfer implements MoralisDataObject { private _data: StreamEvmNftTransferData; - constructor(data: StreamEvmNftTransferInput, core: MoralisCore) { + constructor(data: StreamEvmNftTransferInput, core: Core) { this._data = StreamEvmNftTransfer.parse(data, core); } @@ -20,22 +20,22 @@ export class StreamEvmNftTransfer implements MoralisDataObject { * Create a new instance of StreamEvmNftTransferish * * @param data - the StreamEvmNftTransferishish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const transfer = StreamEvmTransactionish.create(data); * ``` * @returns an instance of StreamEvmNftTransfer */ - static create(data: StreamEvmNftTransferish, core?: MoralisCore) { + static create(data: StreamEvmNftTransferish, core?: Core) { if (data instanceof StreamEvmNftTransfer) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamEvmNftTransfer(data, finalCore); } - private static parse(data: StreamEvmNftTransferInput, core: MoralisCore): StreamEvmNftTransferData { + private static parse(data: StreamEvmNftTransferInput, core: Core): StreamEvmNftTransferData { return { ...data, chain: EvmChain.create(data.chain, core), diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts index 0492e7daaf..1d49eca390 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmTransaction } from './StreamEvmTransaction'; import { mockStreamEvmTransactionInput } from './StreamEvmTransaction.mock'; @@ -6,7 +6,7 @@ import { mockStreamEvmTransactionInput } from './StreamEvmTransaction.mock'; const testsInputs = Object.entries(mockStreamEvmTransactionInput).map(([name, input]) => ({ name, input })); describe('StreamEvmTransaction', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts index 88a80aa0e8..f3f06adbb9 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransaction/StreamEvmTransaction.ts @@ -1,4 +1,4 @@ -import MoralisCore, { BigNumber, maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { BigNumber, maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain, EvmSignature } from '@moralisweb3/common-evm-utils'; import { StreamEvmTransactionData, StreamEvmTransactionInput, StreamEvmTransactionJSON } from './types'; @@ -12,7 +12,7 @@ type StreamEvmTransactionish = StreamEvmTransaction | StreamEvmTransactionInput; export class StreamEvmTransaction implements MoralisDataObject { private _data: StreamEvmTransactionData; - constructor({ ...data }: StreamEvmTransactionInput, core: MoralisCore) { + constructor({ ...data }: StreamEvmTransactionInput, core: Core) { this._data = StreamEvmTransaction.parse(data, core); } @@ -20,22 +20,22 @@ export class StreamEvmTransaction implements MoralisDataObject { * Create a new instance of StreamEvmTransactionish * * @param data - the StreamEvmTransactionishish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const transaction = StreamEvmTransactionish.create(data); * ``` * @returns an instance of StreamEvmTransaction */ - static create(data: StreamEvmTransactionish, core?: MoralisCore) { + static create(data: StreamEvmTransactionish, core?: Core) { if (data instanceof StreamEvmTransaction) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamEvmTransaction(data, finalCore); } - private static parse(data: StreamEvmTransactionInput, core: MoralisCore): StreamEvmTransactionData { + private static parse(data: StreamEvmTransactionInput, core: Core): StreamEvmTransactionData { const signature = data.r != null && data.s != null && data.v != null ? EvmSignature.create({ r: data.r, s: data.s, v: data.v }) diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts index d7f88620d7..4c0e7031b1 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.test.ts @@ -1,4 +1,4 @@ -import MoralisCore from '@moralisweb3/common-core'; +import Core from '@moralisweb3/common-core'; import { setupStreamsUtils } from '../../test/setup'; import { StreamEvmTransactionLog } from './StreamEvmTransactionLog'; import { mockStreamEvmTransactionLogInput } from './StreamEvmTransactionLog.mock'; @@ -6,7 +6,7 @@ import { mockStreamEvmTransactionLogInput } from './StreamEvmTransactionLog.mock const testsInputs = Object.entries(mockStreamEvmTransactionLogInput).map(([name, input]) => ({ name, input })); describe('StreamEvmTransactionLog', () => { - let core: MoralisCore; + let core: Core; beforeAll(() => { core = setupStreamsUtils(); diff --git a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts index aec851ebf3..0ea3c5d360 100644 --- a/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts +++ b/packages/common/streamsUtils/src/dataTypes/StreamEvmTransactionLog/StreamEvmTransactionLog.ts @@ -1,4 +1,4 @@ -import MoralisCore, { maybe, MoralisCoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; +import Core, { maybe, CoreProvider, MoralisDataObject } from '@moralisweb3/common-core'; import { EvmAddress, EvmChain } from '@moralisweb3/common-evm-utils'; import { StreamEvmTransactionLogData, StreamEvmTransactionLogInput, StreamEvmTransactionLogJSON } from './types'; @@ -12,7 +12,7 @@ type StreamEvmTransactionLogish = StreamEvmTransactionLog | StreamEvmTransaction export class StreamEvmTransactionLog implements MoralisDataObject { private _data: StreamEvmTransactionLogData; - constructor({ ...data }: StreamEvmTransactionLogInput, core: MoralisCore) { + constructor({ ...data }: StreamEvmTransactionLogInput, core: Core) { this._data = StreamEvmTransactionLog.parse(data, core); } @@ -20,22 +20,22 @@ export class StreamEvmTransactionLog implements MoralisDataObject { * Create a new instance of StreamEvmTransactionLog * * @param data - the StreamEvmTransactionLogish type - * @param core - the MoralisCore instance + * @param core - the Core instance * @example * ```ts * const transactionLog = StreamEvmTransactionLog.create(data); * ``` * @returns an instance of StreamEvmTransactionLog */ - static create(data: StreamEvmTransactionLogish, core?: MoralisCore) { + static create(data: StreamEvmTransactionLogish, core?: Core) { if (data instanceof StreamEvmTransactionLog) { return data; } - const finalCore = core ?? MoralisCoreProvider.getDefault(); + const finalCore = core ?? CoreProvider.getDefault(); return new StreamEvmTransactionLog(data, finalCore); } - private static parse(data: StreamEvmTransactionLogInput, core: MoralisCore): StreamEvmTransactionLogData { + private static parse(data: StreamEvmTransactionLogInput, core: Core): StreamEvmTransactionLogData { return { ...data, chain: EvmChain.create(data.chain, core), diff --git a/packages/common/streamsUtils/src/test/setup.ts b/packages/common/streamsUtils/src/test/setup.ts index 9d64165ab8..3971847d86 100644 --- a/packages/common/streamsUtils/src/test/setup.ts +++ b/packages/common/streamsUtils/src/test/setup.ts @@ -1,11 +1,11 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; export const setupStreamsUtils = () => { - const core = MoralisCore.create(); + const core = Core.create(); const evmUtils = CommonEvmUtils.create(core); core.registerModules([evmUtils]); - MoralisCoreProvider.setDefault(core); + CoreProvider.setDefault(core); return core; }; diff --git a/packages/evmApi/integration/setup.ts b/packages/evmApi/integration/setup.ts index 0e5134c6d3..fe83d53847 100644 --- a/packages/evmApi/integration/setup.ts +++ b/packages/evmApi/integration/setup.ts @@ -1,17 +1,17 @@ import { ApiUtils } from '@moralisweb3/api-utils'; -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { EvmApi } from '../src/EvmApi'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; export function setupEvmApi(): EvmApi { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const commonEvmUtils = CommonEvmUtils.create(core); const evmApi = EvmApi.create(core); - // DO NOT SET `MoralisCoreProvider.setDefault(core)` here! + // DO NOT SET `CoreProvider.setDefault(core)` here! core.registerModules([apiUtils, commonEvmUtils, evmApi]); core.start({ diff --git a/packages/evmApi/src/EvmApi.test.ts b/packages/evmApi/src/EvmApi.test.ts index f05bd7fa15..fe1110f6b9 100644 --- a/packages/evmApi/src/EvmApi.test.ts +++ b/packages/evmApi/src/EvmApi.test.ts @@ -1,11 +1,11 @@ -import { MoralisCore, AxiosRetry } from '@moralisweb3/common-core'; +import { Core, AxiosRetry } from '@moralisweb3/common-core'; import { ApiUtils, ApiUtilsConfig } from '@moralisweb3/api-utils'; import { EvmApi } from './EvmApi'; describe('EvmApi', () => { it('supports multi-tenancy', async () => { function createEvmApi(apiKey: string): EvmApi { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const evmApi = EvmApi.create(core); core.registerModules([apiUtils, evmApi]); diff --git a/packages/evmApi/src/EvmApi.ts b/packages/evmApi/src/EvmApi.ts index 18be81ee62..0c0fb9692e 100644 --- a/packages/evmApi/src/EvmApi.ts +++ b/packages/evmApi/src/EvmApi.ts @@ -1,7 +1,7 @@ import { ApiModule, - MoralisCore, - MoralisCoreProvider, + Core, + CoreProvider, Operation, PaginatedOperation, PaginatedRequest, @@ -51,11 +51,11 @@ const BASE_URL = 'https://deep-index.moralis.io/api/v2'; export class EvmApi extends ApiModule { public static readonly moduleName = 'evmApi'; - public static create(core?: MoralisCore): EvmApi { - return new EvmApi(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): EvmApi { + return new EvmApi(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(EvmApi.moduleName, core, BASE_URL); } diff --git a/packages/evmApi/src/resolvers/EvmChainResolver.ts b/packages/evmApi/src/resolvers/EvmChainResolver.ts index be934bd7b4..04db80b44f 100644 --- a/packages/evmApi/src/resolvers/EvmChainResolver.ts +++ b/packages/evmApi/src/resolvers/EvmChainResolver.ts @@ -1,9 +1,9 @@ -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { EvmChain, EvmChainish, EvmChainResolver as CommonEvmChainResolver } from '@moralisweb3/common-evm-utils'; // TODO: we need to remove this class after refactor. export class EvmChainResolver { - public static resolve(chain: EvmChainish | undefined, core: MoralisCore): EvmChain { + public static resolve(chain: EvmChainish | undefined, core: Core): EvmChain { return CommonEvmChainResolver.resolve(chain, core); } } diff --git a/packages/evmApi/src/resolvers/block/getBlock.ts b/packages/evmApi/src/resolvers/block/getBlock.ts index 83fb3aa414..b6e7def08f 100644 --- a/packages/evmApi/src/resolvers/block/getBlock.ts +++ b/packages/evmApi/src/resolvers/block/getBlock.ts @@ -1,5 +1,5 @@ import { createEndpoint, createEndpointFactory } from '@moralisweb3/api-utils'; -import MoralisCore, { Camelize, toCamelCase } from '@moralisweb3/common-core'; +import Core, { Camelize, toCamelCase } from '@moralisweb3/common-core'; import { EvmChainish, EvmTransaction, EvmTransactionLog, EvmBlock } from '@moralisweb3/common-evm-utils'; import { operations } from '../../generated/types'; import { EvmChainResolver } from '../EvmChainResolver'; @@ -15,7 +15,7 @@ export interface Params extends Camelize> { type ApiResult = operations[operation]['responses']['200']['content']['application/json']; -const apiToResult = (core: MoralisCore, apiData: ApiResult, params: Params) => { +const apiToResult = (core: Core, apiData: ApiResult, params: Params) => { const data = toCamelCase(apiData); const chain = EvmChainResolver.resolve(params.chain, core); diff --git a/packages/moralis/src/index.ts b/packages/moralis/src/index.ts index 9991ed3a25..51017aa3c3 100644 --- a/packages/moralis/src/index.ts +++ b/packages/moralis/src/index.ts @@ -5,10 +5,10 @@ import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; import { EvmApi } from '@moralisweb3/evm-api'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; import { SolApi } from '@moralisweb3/sol-api'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; // Core -const core = MoralisCore.create(); +const core = Core.create(); // Utility modules const commonEvmUtils = CommonEvmUtils.create(core); @@ -21,10 +21,10 @@ const streams = MoralisStreams.create(core); const evmApi = EvmApi.create(core); const solApi = SolApi.create(core); -// Register all Moralis modules to MoralisCore +// Register all Moralis modules to Core core.registerModules([commonEvmUtils, commonSolUtils, auth, apiUtils, evmApi, solApi, streams]); -MoralisCoreProvider.setDefault(core); +CoreProvider.setDefault(core); const Moralis = { Core: core, diff --git a/packages/solApi/integration/setup.ts b/packages/solApi/integration/setup.ts index 28c0167462..0bf42e8946 100644 --- a/packages/solApi/integration/setup.ts +++ b/packages/solApi/integration/setup.ts @@ -1,17 +1,17 @@ import { ApiUtils } from '@moralisweb3/api-utils'; -import { MoralisCore } from '@moralisweb3/common-core'; +import { Core } from '@moralisweb3/common-core'; import { CommonSolUtils } from '@moralisweb3/common-sol-utils'; import { SolApi } from '../src/SolApi'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; export function setupSolApi(): SolApi { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const commonSolUtils = CommonSolUtils.create(core); const solApi = SolApi.create(core); - // DO NOT SET `MoralisCoreProvider.setDefault(core)` here! + // DO NOT SET `CoreProvider.setDefault(core)` here! core.registerModules([apiUtils, commonSolUtils, solApi]); core.start({ diff --git a/packages/solApi/src/SolApi.ts b/packages/solApi/src/SolApi.ts index 149c226f52..b8553fe783 100644 --- a/packages/solApi/src/SolApi.ts +++ b/packages/solApi/src/SolApi.ts @@ -1,5 +1,5 @@ import { OperationResolver } from '@moralisweb3/api-utils'; -import { ApiModule, MoralisCore, MoralisCoreProvider, Operation } from '@moralisweb3/common-core'; +import { ApiModule, Core, CoreProvider, Operation } from '@moralisweb3/common-core'; import { getBalanceOperation, getNFTMetadataOperation, @@ -14,11 +14,11 @@ const BASE_URL = 'https://solana-gateway.moralis.io'; export class SolApi extends ApiModule { public static readonly moduleName = 'solApi'; - public static create(core?: MoralisCore): SolApi { - return new SolApi(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): SolApi { + return new SolApi(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(SolApi.moduleName, core, BASE_URL); } diff --git a/packages/streams/integration/setup.ts b/packages/streams/integration/setup.ts index ee19d39ee0..23c493008c 100644 --- a/packages/streams/integration/setup.ts +++ b/packages/streams/integration/setup.ts @@ -1,17 +1,17 @@ import { ApiUtils } from '@moralisweb3/api-utils'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; import { MoralisStreams } from '../src/MoralisStreams'; import { MOCK_API_KEY } from './mocks/config'; import { mockServer } from './mocks/mockServer'; export function setupStreamApi(): MoralisStreams { - const core = MoralisCore.create(); + const core = Core.create(); const apiUtils = ApiUtils.create(core); const commonEvmUtils = CommonEvmUtils.create(core); const streamsApi = MoralisStreams.create(core); - MoralisCoreProvider.setDefault(core); + CoreProvider.setDefault(core); core.registerModules([apiUtils, commonEvmUtils, streamsApi]); core.start({ diff --git a/packages/streams/src/MoralisStreams.ts b/packages/streams/src/MoralisStreams.ts index bdf1f2c1bd..85e838ff81 100644 --- a/packages/streams/src/MoralisStreams.ts +++ b/packages/streams/src/MoralisStreams.ts @@ -1,6 +1,6 @@ import { getSettings, setSettings } from './resolvers'; import { Endpoints } from '@moralisweb3/api-utils'; -import { ApiModule, MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { ApiModule, Core, CoreProvider } from '@moralisweb3/common-core'; import { makeCreateStream } from './methods/create'; import { makeUpdateStream } from './methods/update'; import { makeDeleteStream } from './methods/delete'; @@ -22,11 +22,11 @@ const BASE_URL = 'https://api.moralis-streams.com'; export class MoralisStreams extends ApiModule { public static readonly moduleName = 'streams'; - public static create(core?: MoralisCore): MoralisStreams { - return new MoralisStreams(core ?? MoralisCoreProvider.getDefault()); + public static create(core?: Core): MoralisStreams { + return new MoralisStreams(core ?? CoreProvider.getDefault()); } - private constructor(core: MoralisCore) { + private constructor(core: Core) { super(MoralisStreams.moduleName, core, BASE_URL); } diff --git a/packages/streams/src/methods/verifySignature.ts b/packages/streams/src/methods/verifySignature.ts index 52781f3361..681fc87bb8 100644 --- a/packages/streams/src/methods/verifySignature.ts +++ b/packages/streams/src/methods/verifySignature.ts @@ -1,5 +1,5 @@ import { ApiUtilsConfig } from '@moralisweb3/api-utils'; -import { MoralisCore, MoralisStreamError, StreamErrorCode } from '@moralisweb3/common-core'; +import { Core, MoralisStreamError, StreamErrorCode } from '@moralisweb3/common-core'; import { IWebhook } from '@moralisweb3/streams-typings'; import { sha3 } from '../utils/sha3'; @@ -9,7 +9,7 @@ export interface VerifySignatureOptions { } export const makeVerifySignature = - (core: MoralisCore) => + (core: Core) => ({ body, signature }: VerifySignatureOptions): boolean => { const apiKey = core.config.get(ApiUtilsConfig.apiKey); if (!apiKey) { diff --git a/packages/streams/src/test/setup.ts b/packages/streams/src/test/setup.ts index 8df493f655..eca451dedc 100644 --- a/packages/streams/src/test/setup.ts +++ b/packages/streams/src/test/setup.ts @@ -1,13 +1,13 @@ -import { MoralisCore, MoralisCoreProvider } from '@moralisweb3/common-core'; +import { Core, CoreProvider } from '@moralisweb3/common-core'; import { MoralisStreams } from '../MoralisStreams'; import { CommonEvmUtils } from '@moralisweb3/common-evm-utils'; export const setupStreams = () => { - const core = MoralisCore.create(); + const core = Core.create(); const moralisStreams = MoralisStreams.create(core); const evmUtils = CommonEvmUtils.create(core); core.registerModules([moralisStreams, evmUtils]); - MoralisCoreProvider.setDefault(core); + CoreProvider.setDefault(core); return core; };