Merge remote-tracking branch 'origin/alpha' into update-auth-ap-paths

.changeset/early-points-hammer.md

@@ -0,0 +1,7 @@
+---
+'@moralisweb3/core': major
+'@moralisweb3/sol-api': major
+'@moralisweb3/sol-utils': major
+---
+
+Adding solUtils package to codebase.

.github/workflows/main.yml

@@ -30,7 +30,7 @@ jobs:
         id: cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C1
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C2
       - name: Install packages
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install
@@ -55,7 +55,7 @@ jobs:
         id: cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C1
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C2
       - name: ESLint
         run: yarn lint
         continue-on-error: true
@@ -87,7 +87,7 @@ jobs:
         id: cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C1
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C2
       - name: Prettier
         run: yarn format:check
 
@@ -111,7 +111,7 @@ jobs:
         id: cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C1
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}_C2
       - name: Build
         run: yarn build
       - name: Test

demos/test-node/src/SolApi.ts

@@ -1,4 +1,4 @@
-import { SolNetworkName } from '@moralisweb3/core';
+import { SolNetworkName } from '@moralisweb3/sol-utils';
 import Moralis from 'moralis';
 import { smokeTest } from './Tester';
 

jest.config.js

@@ -2,8 +2,9 @@ module.exports = {
   // Map workspaces to their source code so that Jest can resolve them correctly.
   moduleNameMapper: {
     '^@moralisweb3/evm-api': '<rootDir>/../evmApi/src',
+    '^@moralisweb3/sol-utils': '<rootDir>/../solUtils/src',
     '^@moralisweb3/evm-utils': '<rootDir>/../evmUtils/src',
-    '^@moralisweb3/api': '<rootDir>/../api/src',
+    '^@moralisweb3/api-utils': '<rootDir>/../apiUtils/src',
     '^@moralisweb3/core': '<rootDir>/../core/src',
     '^@moralisweb3/(.*)$': '<rootDir>/../$1/src',
   },

packages/api/package.json → packages/apiUtils/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@moralisweb3/api",
+  "name": "@moralisweb3/api-utils",
   "author": "Moralis",
   "version": "2.0.0-alpha.2",
   "license": "MIT",

packages/api/src/MoralisApi.ts → packages/apiUtils/src/MoralisApiUtils.ts

@@ -1,15 +1,15 @@
 import { Module, MoralisCore, MoralisCoreProvider } from '@moralisweb3/core';
 import { ApiConfigSetup } from './config/ApiConfigSetup';
 
-export class MoralisApi extends Module {
+export class MoralisApiUtils extends Module {
   public static readonly moduleName = 'api';
 
-  public static create(core?: MoralisCore): MoralisApi {
-    return new MoralisApi(core ?? MoralisCoreProvider.getDefault());
+  public static create(core?: MoralisCore): MoralisApiUtils {
+    return new MoralisApiUtils(core ?? MoralisCoreProvider.getDefault());
   }
 
   public constructor(core: MoralisCore) {
-    super(MoralisApi.moduleName, core);
+    super(MoralisApiUtils.moduleName, core);
   }
 
   public setup() {

packages/api/src/index.ts → packages/apiUtils/src/index.ts

@@ -3,4 +3,4 @@ export * from './ApiResultAdapter';
 export * from './PaginatedResolver';
 export * from './ApiPaginatedResultAdapter';
 export * from './utils';
-export * from './MoralisApi';
+export * from './MoralisApiUtils';

packages/api/src/test/setup.ts → packages/apiUtils/src/test/setup.ts

@@ -1,13 +1,13 @@
 import { MoralisCoreProvider } from '@moralisweb3/core';
 import { MoralisEvmUtils } from '@moralisweb3/evm-utils';
-import { MoralisApi } from '@moralisweb3/api';
+import { MoralisApiUtils } from '@moralisweb3/api-utils';
 
 export const setupApi = () => {
   const core = MoralisCoreProvider.getDefault();
-  const api = MoralisApi.create();
+  const apiUtils = MoralisApiUtils.create();
   const evmUtils = MoralisEvmUtils.create();
 
-  core.registerModules([api, evmUtils]);
+  core.registerModules([apiUtils, evmUtils]);
 
   return core;
 };

packages/auth/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@moralisweb3/core": "^2.0.0-alpha.2",
-    "@moralisweb3/api": "^2.0.0-alpha.2",
+    "@moralisweb3/api-utils": "^2.0.0-alpha.2",
     "@moralisweb3/evm-utils": "^2.0.0-alpha.2"
   }
 }

packages/auth/src/resolvers/evmRequestChallenge.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { toCamelCase } from '@moralisweb3/core';
 import { operations } from '../generated/types';
 import { BASE_URL } from '../MoralisAuth';

packages/auth/src/resolvers/evmVerifyChallenge.ts

@@ -1,6 +1,6 @@
 import { maybe, toCamelCase } from '@moralisweb3/core';
 import { EvmAddress, EvmChain } from '@moralisweb3/evm-utils';
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { operations } from '../generated/types';
 import { BASE_URL } from '../MoralisAuth';
 

packages/core/src/Config/MoralisConfig.ts

@@ -1,4 +1,4 @@
-import { SolNetworkish } from '../dataTypes';
+import { SolNetworkish } from './interfaces';
 import { CoreConfig, EvmAddressFormat, EvmChainIdFormat } from './CoreConfig';
 import { EvmChainish } from './interfaces/EvmChainish';
 

packages/core/src/Config/interfaces/SolNetworkish.ts

@@ -0,0 +1,14 @@
+/**
+ * Note this is just an interface, used in the core config.
+ * The implementations are located in the @moralisweb3/sol-utils package.
+ */
+
+export const solNetworkNames = ['mainnet', 'devnet'] as const;
+
+export type SolNetworkName = typeof solNetworkNames[number];
+
+export interface SolNetworkable {
+  network: SolNetworkName;
+}
+
+export type SolNetworkish = SolNetworkable | string;

packages/core/src/Config/interfaces/index.ts

@@ -1 +1,2 @@
+export * from './SolNetworkish';
 export * from './EvmChainish';

packages/core/src/dataTypes/index.ts

@@ -1,4 +1 @@
-export * from './SolNetwork';
-export * from './SolAddress';
-export * from './SolNative';
 export * from './abstract';

packages/evmApi/package.json

@@ -27,7 +27,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@moralisweb3/api": "^2.0.0-alpha.2",
+    "@moralisweb3/api-utils": "^2.0.0-alpha.2",
     "@moralisweb3/core": "^2.0.0-alpha.2",
     "@moralisweb3/evm-utils": "^2.0.0-alpha.2",
     "ethers": "^5.6.2"

packages/evmApi/src/resolvers/account/getNFTTransfers.ts

@@ -2,7 +2,7 @@ import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNative } from '@moralisweb3/evm-utils';
 import { operations } from '../../generated/types';
 import { BASE_URL } from '../../EvmApi';
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { EvmChainResolver } from '../EvmChainResolver';
 
 type operation = 'getNFTTransfers';

packages/evmApi/src/resolvers/account/getNFTs.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/account/getNFTsForContract.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/account/getNativeBalance.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmAddressish, EvmChainish, EvmNative, EvmAddress } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/account/getTokenBalances.ts

@@ -2,7 +2,7 @@ import { Camelize } from '@moralisweb3/core';
 import { Erc20Token, Erc20Value, EvmAddressish, EvmChainish, EvmAddress } from '@moralisweb3/evm-utils';
 import { operations } from '../../generated/types';
 import { BASE_URL } from '../../EvmApi';
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { EvmChainResolver } from '../EvmChainResolver';
 
 type operation = 'getTokenBalances';

packages/evmApi/src/resolvers/account/getTokenTransfers.ts

@@ -2,7 +2,7 @@ import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress } from '@moralisweb3/evm-utils';
 import { operations } from '../../generated/types';
 import { BigNumber } from 'ethers';
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { BASE_URL } from '../../EvmApi';
 import { EvmChainResolver } from '../EvmChainResolver';
 

packages/evmApi/src/resolvers/account/getTransactions.ts

@@ -2,7 +2,7 @@ import { BigNumber } from 'ethers';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmTransactionReceipt, EvmAddress } from '@moralisweb3/evm-utils';
 import { operations } from '../../generated/types';
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { BASE_URL } from '../../EvmApi';
 import { EvmChainResolver } from '../EvmChainResolver';
 

packages/evmApi/src/resolvers/defi/getPairAddress.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { Erc20Token, EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/defi/getPairReserves.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/info/endpointWeights.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';
 

packages/evmApi/src/resolvers/info/web3ApiVersion.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';
 

packages/evmApi/src/resolvers/native/getBlock.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmAddress, EvmChainish, EvmTransactionReceipt } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/native/getContractEvents.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver, BodyType, ApiPaginatedResponse } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver, BodyType, ApiPaginatedResponse } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddress, EvmAddressish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/native/getDateToBlock.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { EvmChainish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';

packages/evmApi/src/resolvers/native/getLogsByAddress.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmTransactionLog } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/native/getNFTTransfersByBlock.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddress, EvmNative, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/native/getTransaction.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmTransactionReceipt } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/native/runContractFunction.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { EvmChainish, EvmAddress, EvmAddressish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';

packages/evmApi/src/resolvers/resolve/resolveAddress.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmAddress, EvmAddressish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/resolve/resolveDomain.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { EvmAddress } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';

packages/evmApi/src/resolvers/storage/uploadFolder.ts

@@ -1,4 +1,4 @@
-import { ApiResolver, BodyType } from '@moralisweb3/api';
+import { ApiResolver, BodyType } from '@moralisweb3/api-utils';
 import { BASE_URL } from '../../EvmApi';
 import { operations } from '../../generated/types';
 

packages/evmApi/src/resolvers/token/getAllTokenIds.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedResolver, ApiPaginatedOptions } from '@moralisweb3/api';
+import { ApiPaginatedResolver, ApiPaginatedOptions } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getContractNFTTransfers.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNative } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getNFTLowestPrice.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNative } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getNFTMetadata.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { toCamelCase } from '@moralisweb3/core';
 import { EvmAddress, EvmAddressish, EvmChain, EvmChainish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getNFTOwners.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getNFTTrades.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNative } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getNftTransfersFromToBlock.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddress, EvmNative } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenAddressTransfers.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, Erc20Value } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenAllowance.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from 'ethers';
 import { Camelize } from '@moralisweb3/core';
 import { EvmAddress, EvmAddressish, EvmChainish } from '@moralisweb3/evm-utils';
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { operations } from '../../generated/types';
 import { BASE_URL } from '../../EvmApi';
 import { EvmChainResolver } from '../EvmChainResolver';

packages/evmApi/src/resolvers/token/getTokenIdMetadata.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenIdOwners.ts

@@ -1,4 +1,4 @@
-import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api';
+import { ApiPaginatedOptions, ApiPaginatedResolver } from '@moralisweb3/api-utils';
 import { Camelize } from '@moralisweb3/core';
 import { EvmChainish, EvmAddressish, EvmAddress, EvmNFT } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenMetadata.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { Erc20Token, EvmChainish, EvmAddressish, EvmAddress } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenMetadataBySymbol.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { Erc20Token, EvmChainish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';

packages/evmApi/src/resolvers/token/getTokenPrice.ts

@@ -1,4 +1,4 @@
-import { ApiResolver } from '@moralisweb3/api';
+import { ApiResolver } from '@moralisweb3/api-utils';
 import { Camelize, toCamelCase } from '@moralisweb3/core';
 import { EvmNative, EvmAddress, EvmChainish, EvmAddressish } from '@moralisweb3/evm-utils';
 import { BASE_URL } from '../../EvmApi';