From 069e4b30bf527c560f3a4dd8f4b18a4aa71205d8 Mon Sep 17 00:00:00 2001 From: Reiss2000 Date: Tue, 16 Aug 2022 19:57:10 +0100 Subject: [PATCH 1/3] fix: update moralis imports to moralis-v1 --- package.json | 2 +- src/context/MoralisContext/MoralisContext.ts | 2 +- src/hooks/core/useMoralis/_useMoralisAuth.ts | 2 +- src/hooks/core/useMoralis/_useMoralisInit.ts | 2 +- src/hooks/core/useMoralis/_useMoralisUser.ts | 2 +- src/hooks/core/useMoralis/_useMoralisWeb3.ts | 2 +- src/hooks/core/useMoralis/utils/setUserData.ts | 2 +- src/hooks/core/useMoralisFile/useMoralisFile.ts | 2 +- src/hooks/core/useMoralisObject/useNewMoralisObject.ts | 2 +- src/hooks/core/useMoralisQuery/_useSafeUpdatedQuery.ts | 2 +- src/hooks/core/useMoralisQuery/useMoralisQuery.ts | 2 +- .../_useMoralisSubscriptionListener.ts | 2 +- .../core/useMoralisSubscription/useMoralisSubscription.ts | 2 +- .../web3ApiWrappers/useERC20Balances/useERC20Balances.ts | 2 +- .../useERC20Transfers/useERC20Transfers.ts | 2 +- .../web3ApiWrappers/useNFTBalances/useNFTBalances.ts | 2 +- .../web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts | 2 +- .../useNativeTransactions/useNativeTransactions.ts | 2 +- src/hooks/web3ApiWrappers/useTokenPrice/useTokenPrice.ts | 2 +- src/utils/genericQuery.ts | 2 +- yarn.lock | 8 ++++---- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index f8cbb8a..4a69fc2 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "husky": "^7.0.4", "jest": "^27.4.5", "lint-staged": "^12.1.2", - "moralis": "1.8.0", + "moralis-v1": "^1.11.0", "prettier": "^2.5.1", "rollup": "^2.61.1", "rollup-plugin-cleaner": "^1.0.0", diff --git a/src/context/MoralisContext/MoralisContext.ts b/src/context/MoralisContext/MoralisContext.ts index 8fc79c1..caa2598 100644 --- a/src/context/MoralisContext/MoralisContext.ts +++ b/src/context/MoralisContext/MoralisContext.ts @@ -1,5 +1,5 @@ import { createContext } from "react"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { AuthenticateOptions, Authentication, diff --git a/src/hooks/core/useMoralis/_useMoralisAuth.ts b/src/hooks/core/useMoralis/_useMoralisAuth.ts index 6441aee..01aed14 100644 --- a/src/hooks/core/useMoralis/_useMoralisAuth.ts +++ b/src/hooks/core/useMoralis/_useMoralisAuth.ts @@ -1,7 +1,7 @@ import { useState, useCallback, useEffect } from "react"; import { setMultipleDataToUser, SetUserData } from "./utils/setUserData"; import { AuthError } from "../../../context/MoralisContext/MoralisContext"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { Environment } from "./_useMoralisInit"; export enum AuthenticationState { diff --git a/src/hooks/core/useMoralis/_useMoralisInit.ts b/src/hooks/core/useMoralis/_useMoralisInit.ts index 6aa75a2..a043864 100644 --- a/src/hooks/core/useMoralis/_useMoralisInit.ts +++ b/src/hooks/core/useMoralis/_useMoralisInit.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useRef, useState } from "react"; -import MoralisImport from "moralis"; +import MoralisImport from "moralis-v1"; import { ReactMoralisError } from "../../../Errors"; export type Environment = "browser" | "native"; diff --git a/src/hooks/core/useMoralis/_useMoralisUser.ts b/src/hooks/core/useMoralis/_useMoralisUser.ts index 87fd76f..d1aed5f 100644 --- a/src/hooks/core/useMoralis/_useMoralisUser.ts +++ b/src/hooks/core/useMoralis/_useMoralisUser.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useCallback, useState } from "react"; import { NotAuthenticatedError, ReactMoralisError } from "../../../Errors"; import { setMultipleDataToUser, SetUserData } from "./utils/setUserData"; diff --git a/src/hooks/core/useMoralis/_useMoralisWeb3.ts b/src/hooks/core/useMoralis/_useMoralisWeb3.ts index a512a3c..14af3e0 100644 --- a/src/hooks/core/useMoralis/_useMoralisWeb3.ts +++ b/src/hooks/core/useMoralis/_useMoralisWeb3.ts @@ -1,5 +1,5 @@ import { useState, useCallback, useEffect, useMemo } from "react"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; export type Web3EnableOptions = MoralisType.EnableOptions & { onError?: (error: Error) => void; diff --git a/src/hooks/core/useMoralis/utils/setUserData.ts b/src/hooks/core/useMoralis/utils/setUserData.ts index 3ea4cec..d54a221 100644 --- a/src/hooks/core/useMoralis/utils/setUserData.ts +++ b/src/hooks/core/useMoralis/utils/setUserData.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { ValidationError } from "../../../../Errors"; // UserData can accept all these types diff --git a/src/hooks/core/useMoralisFile/useMoralisFile.ts b/src/hooks/core/useMoralisFile/useMoralisFile.ts index e7bdcf9..b225260 100644 --- a/src/hooks/core/useMoralisFile/useMoralisFile.ts +++ b/src/hooks/core/useMoralisFile/useMoralisFile.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useCallback, useState } from "react"; import { useMoralis } from "../useMoralis"; diff --git a/src/hooks/core/useMoralisObject/useNewMoralisObject.ts b/src/hooks/core/useMoralisObject/useNewMoralisObject.ts index 2f055a8..c798d94 100644 --- a/src/hooks/core/useMoralisObject/useNewMoralisObject.ts +++ b/src/hooks/core/useMoralisObject/useNewMoralisObject.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useCallback, useState } from "react"; import { useMoralis } from "../useMoralis"; diff --git a/src/hooks/core/useMoralisQuery/_useSafeUpdatedQuery.ts b/src/hooks/core/useMoralisQuery/_useSafeUpdatedQuery.ts index 03e6813..66c5e59 100644 --- a/src/hooks/core/useMoralisQuery/_useSafeUpdatedQuery.ts +++ b/src/hooks/core/useMoralisQuery/_useSafeUpdatedQuery.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useMemo } from "react"; import { useMoralis } from "../useMoralis"; import { Query } from "../../../utils/genericQuery"; diff --git a/src/hooks/core/useMoralisQuery/useMoralisQuery.ts b/src/hooks/core/useMoralisQuery/useMoralisQuery.ts index 586b01c..2be0ca4 100644 --- a/src/hooks/core/useMoralisQuery/useMoralisQuery.ts +++ b/src/hooks/core/useMoralisQuery/useMoralisQuery.ts @@ -1,5 +1,5 @@ import { WritableDraft } from "immer/dist/internal"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useCallback } from "react"; import { DefaultQueryAttribute, Query } from "../../../utils/genericQuery"; import { useMoralis } from "../useMoralis"; diff --git a/src/hooks/core/useMoralisSubscription/_useMoralisSubscriptionListener.ts b/src/hooks/core/useMoralisSubscription/_useMoralisSubscriptionListener.ts index f3d3c74..73f7b5f 100644 --- a/src/hooks/core/useMoralisSubscription/_useMoralisSubscriptionListener.ts +++ b/src/hooks/core/useMoralisSubscription/_useMoralisSubscriptionListener.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useEffect } from "react"; import { useMoralis } from "../useMoralis"; diff --git a/src/hooks/core/useMoralisSubscription/useMoralisSubscription.ts b/src/hooks/core/useMoralisSubscription/useMoralisSubscription.ts index 249fe8b..fe9a669 100644 --- a/src/hooks/core/useMoralisSubscription/useMoralisSubscription.ts +++ b/src/hooks/core/useMoralisSubscription/useMoralisSubscription.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useContext, useEffect, useRef, useState } from "react"; import { MoralisContext } from "../../../context"; import { Query } from "../../../utils/genericQuery"; diff --git a/src/hooks/web3ApiWrappers/useERC20Balances/useERC20Balances.ts b/src/hooks/web3ApiWrappers/useERC20Balances/useERC20Balances.ts index cd2c372..638dc26 100644 --- a/src/hooks/web3ApiWrappers/useERC20Balances/useERC20Balances.ts +++ b/src/hooks/web3ApiWrappers/useERC20Balances/useERC20Balances.ts @@ -5,7 +5,7 @@ import { UseMoralisWeb3ApiCallOptions, } from "../../core/useMoralisWeb3Api"; import { DEFAULT_API_CHAIN } from "../../../config"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { isValidApiChain } from "../../../utils/isValidApiChain"; export interface UseERC20BalancesParams diff --git a/src/hooks/web3ApiWrappers/useERC20Transfers/useERC20Transfers.ts b/src/hooks/web3ApiWrappers/useERC20Transfers/useERC20Transfers.ts index 5815c0f..793b4e9 100644 --- a/src/hooks/web3ApiWrappers/useERC20Transfers/useERC20Transfers.ts +++ b/src/hooks/web3ApiWrappers/useERC20Transfers/useERC20Transfers.ts @@ -6,7 +6,7 @@ import { UseMoralisWeb3ApiCallOptions, } from "../../core/useMoralisWeb3Api"; import { DEFAULT_API_CHAIN } from "../../../config"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { isValidApiChain } from "../../../utils/isValidApiChain"; export interface UseERC20TransfersParams diff --git a/src/hooks/web3ApiWrappers/useNFTBalances/useNFTBalances.ts b/src/hooks/web3ApiWrappers/useNFTBalances/useNFTBalances.ts index cd48b1c..9b3f4d0 100644 --- a/src/hooks/web3ApiWrappers/useNFTBalances/useNFTBalances.ts +++ b/src/hooks/web3ApiWrappers/useNFTBalances/useNFTBalances.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useMoralis } from "../../core/useMoralis"; import { useMoralisWeb3Api, diff --git a/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts b/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts index 80f26f0..720bf5f 100644 --- a/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts +++ b/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useMoralis } from "../../core/useMoralis"; import { useMoralisWeb3Api, diff --git a/src/hooks/web3ApiWrappers/useNativeTransactions/useNativeTransactions.ts b/src/hooks/web3ApiWrappers/useNativeTransactions/useNativeTransactions.ts index c6afa6e..8c97e17 100644 --- a/src/hooks/web3ApiWrappers/useNativeTransactions/useNativeTransactions.ts +++ b/src/hooks/web3ApiWrappers/useNativeTransactions/useNativeTransactions.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { useMoralis } from "../../core/useMoralis"; import { useMoralisWeb3Api, diff --git a/src/hooks/web3ApiWrappers/useTokenPrice/useTokenPrice.ts b/src/hooks/web3ApiWrappers/useTokenPrice/useTokenPrice.ts index 44b9f66..2430e11 100644 --- a/src/hooks/web3ApiWrappers/useTokenPrice/useTokenPrice.ts +++ b/src/hooks/web3ApiWrappers/useTokenPrice/useTokenPrice.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; import { tokenValueTxt, toUsd } from "../../../utils/formatters"; import { useMoralisWeb3Api, diff --git a/src/utils/genericQuery.ts b/src/utils/genericQuery.ts index 3676dc2..e2d0635 100644 --- a/src/utils/genericQuery.ts +++ b/src/utils/genericQuery.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis"; +import MoralisType from "moralis-v1"; export type DefaultQueryAttribute = MoralisType.Attributes; diff --git a/yarn.lock b/yarn.lock index 224a4e7..3f24c7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7246,10 +7246,10 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -moralis@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/moralis/-/moralis-1.8.0.tgz#fc0aee2fdccde195e04e9395fa78bac97c1b133f" - integrity sha512-p8V5Ur4oLymweySUh+TBuYmQVDeqnNO3+Lk+VfPorGJsmbcer6xVy6MHHNinl1zhhWiCJNpc+XWot5wAcMb4QA== +moralis-v1@^1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/moralis-v1/-/moralis-v1-1.11.0.tgz#fc8f5055d14b91c8301337ab58b331fa6e4b4f60" + integrity sha512-6FxKTdh1kOLme+R5Z6kIT++MHwZzTrYGhiS/E7hRnapomY423RThrxsnYgs7XnLEe8g2TLvA4Sx0+DIgwYWTjg== dependencies: "@babel/runtime" "7.16.7" "@babel/runtime-corejs3" "7.16.8" From 2c3e3b429844cf6ac5782b723a7583aefbfca621 Mon Sep 17 00:00:00 2001 From: Reiss2000 Date: Tue, 16 Aug 2022 20:14:03 +0100 Subject: [PATCH 2/3] fix: update moralis/** imports to moralis-v1/** --- src/config/index.ts | 2 +- src/hooks/web3ApiWrappers/useApiContract/useApiContract.ts | 2 +- src/hooks/web3ApiWrappers/useNativeBalance/useNativeBalance.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/index.ts b/src/config/index.ts index 4d7ef06..792f015 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,4 +1,4 @@ -import { components } from "moralis/types/generated/web3Api"; +import { components } from "moralis-v1/types/generated/web3Api"; export type ApiChain = components["schemas"]["chainList"]; export const DEFAULT_API_CHAIN: ApiChain = "eth"; diff --git a/src/hooks/web3ApiWrappers/useApiContract/useApiContract.ts b/src/hooks/web3ApiWrappers/useApiContract/useApiContract.ts index a22f0ea..63fa9d5 100644 --- a/src/hooks/web3ApiWrappers/useApiContract/useApiContract.ts +++ b/src/hooks/web3ApiWrappers/useApiContract/useApiContract.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis/types"; +import MoralisType from "moralis-v1/types"; import { useMoralisWeb3Api, useMoralisWeb3ApiCall, diff --git a/src/hooks/web3ApiWrappers/useNativeBalance/useNativeBalance.ts b/src/hooks/web3ApiWrappers/useNativeBalance/useNativeBalance.ts index 6950da0..f1edbbd 100644 --- a/src/hooks/web3ApiWrappers/useNativeBalance/useNativeBalance.ts +++ b/src/hooks/web3ApiWrappers/useNativeBalance/useNativeBalance.ts @@ -1,4 +1,4 @@ -import MoralisType from "moralis/types"; +import MoralisType from "moralis-v1/types"; import { useMemo } from "react"; import { DEFAULT_API_CHAIN } from "../../../config"; import { isValidApiChain } from "../../../utils/isValidApiChain"; From 19d791ce16b5f0c1a77e8d29e5ee6cb95437a767 Mon Sep 17 00:00:00 2001 From: Reiss2000 Date: Tue, 16 Aug 2022 20:17:19 +0100 Subject: [PATCH 3/3] fix: incorrect type in UseNFTTransfersParams --- src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts b/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts index 720bf5f..890835a 100644 --- a/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts +++ b/src/hooks/web3ApiWrappers/useNFTTransfers/useNFTTransfers.ts @@ -10,7 +10,7 @@ import { isValidApiChain } from "../../../utils/isValidApiChain"; export interface UseNFTTransfersParams extends Omit< - Parameters[0], + Parameters[0], "address" > { address?: string;