Endpoints and types refactor for evm

.gitignore

@@ -49,4 +49,5 @@ packages/**/coverage
 TODO.md
 archive/**/*
 .vscode/
+.idea/
 dump.rdb

.prettierignore

@@ -22,3 +22,6 @@ demos/**/build/**/*
 
 # Docs
 docs/**/*
+
+#Template files
+packages/**/src/**/*.hbs

demos/express-proxy/src/api/proxyGenerator.ts

@@ -1,5 +1,6 @@
 import Moralis from 'moralis';
-import { operations } from '@moralisweb3/common-sol-utils';
+import { operations } from 'moralis/common-sol-utils';
+import { operations as evmOperations } from 'moralis/common-evm-utils';
 import express from 'express';
 import axios from 'axios';
 import { errorHandler } from '../middlewares/errorHandler';
@@ -24,7 +25,7 @@ export class ProxyGenerator {
     let baseUrl: string;
     switch (this.api) {
       case 'evm':
-        descriptors = Moralis.EvmApi.endpoints.getDescriptors();
+        descriptors = evmOperations.map(convertOperationToDescriptor);
         baseUrl = Moralis.EvmApi.baseUrl;
         break;
       case 'solana':

demos/parse-server/src/api/proxyGenerator.ts

@@ -2,7 +2,8 @@ import Moralis from 'moralis';
 import express from 'express';
 import axios from 'axios';
 import { errorHandler } from '../middlewares/errorHandler';
-import { operations } from '@moralisweb3/common-sol-utils';
+import { operations } from 'moralis/common-sol-utils';
+import { operations as evmOperations } from 'moralis/common-evm-utils';
 import { convertOperationToDescriptor } from '@moralisweb3/api-utils';
 
 const proxyRouter = express.Router();
@@ -24,7 +25,7 @@ export class ProxyGenerator {
     let baseUrl: string;
     switch (this.api) {
       case 'evm':
-        descriptors = Moralis.EvmApi.endpoints.getDescriptors();
+        descriptors = evmOperations.map(convertOperationToDescriptor);
         baseUrl = Moralis.EvmApi.baseUrl;
         break;
       case 'solana':

packages/apiUtils/src/resolvers2/OperationRequestBuilder.ts

@@ -20,18 +20,18 @@ export class OperationRequestBuilder<Request> {
 
     let urlPath = this.operation.urlPathPattern;
 
-    for (const paramName of this.operation.urlPathParamNames) {
+    for (const paramName of this.operation.urlPathParamNames ?? []) {
       const paramValue = urlParams[paramName as string];
       if (!paramValue) {
         throw new Error(`Param ${paramName as string} is required`);
       }
-      urlPath = urlPath.replace(`{${paramName as string}}`, paramValue);
+      urlPath = urlPath.replace(`{${paramName as string}}`, paramValue as string);
     }
     const url = `${baseUrl}${urlPath}`;
 
-    const urlSearchParams: Record<string, string> = {};
+    const urlSearchParams: Record<string, string | string[]> = {};
     Object.keys(urlParams)
-      .filter((paramName) => !this.operation.urlPathParamNames.includes(paramName as keyof Request))
+      .filter((paramName) => !this.operation.urlPathParamNames?.includes(paramName as keyof Request))
       .forEach((paramName) => {
         const paramValue = urlParams[paramName];
         if (paramValue) {

packages/apiUtils/src/resolvers2/index.ts

@@ -1,3 +1,4 @@
 export * from './OperationResolver';
 export * from './NullableOperationResolver';
 export * from './PaginatedOperationResolver';
+export * from './NullableOperationResolver';

packages/client/evmApi/src/generated/ClientEvmApi.ts

@@ -1,21 +1,168 @@
 
 // CAUTION: This file is automatically generated. Do not edit it manually!
 
-import { getWalletTokenTransfersOperation, GetWalletTokenTransfersRequest, GetWalletTokenTransfersResponse, GetWalletTokenTransfersJSONResponse, runContractFunctionOperation, RunContractFunctionRequest, RunContractFunctionResponse, RunContractFunctionJSONResponse } from '@moralisweb3/common-evm-utils';
+import { endpointWeightsOperation, EndpointWeightsRequest, EndpointWeightsResponse, EndpointWeightsJSONResponse, runContractFunctionOperation, RunContractFunctionRequest, RunContractFunctionResponse, RunContractFunctionJSONResponse, web3ApiVersionOperation, Web3ApiVersionRequest, Web3ApiVersionResponse, Web3ApiVersionJSONResponse, getBlockOperation, GetBlockRequest, GetBlockResponse, GetBlockJSONResponse, getDateToBlockOperation, GetDateToBlockRequest, GetDateToBlockResponse, GetDateToBlockJSONResponse, getContractEventsOperation, GetContractEventsRequest, GetContractEventsResponse, GetContractEventsJSONResponse, getContractLogsOperation, GetContractLogsRequest, GetContractLogsResponse, GetContractLogsJSONResponse, getContractNFTsOperation, GetContractNFTsRequest, GetContractNFTsResponse, GetContractNFTsJSONResponse, getNFTContractMetadataOperation, GetNFTContractMetadataRequest, GetNFTContractMetadataResponse, GetNFTContractMetadataJSONResponse, getNFTContractTransfersOperation, GetNFTContractTransfersRequest, GetNFTContractTransfersResponse, GetNFTContractTransfersJSONResponse, getNFTLowestPriceOperation, GetNFTLowestPriceRequest, GetNFTLowestPriceResponse, GetNFTLowestPriceJSONResponse, getNFTMetadataOperation, GetNFTMetadataRequest, GetNFTMetadataResponse, GetNFTMetadataJSONResponse, getNFTOwnersOperation, GetNFTOwnersRequest, GetNFTOwnersResponse, GetNFTOwnersJSONResponse, getNFTTokenIdOwnersOperation, GetNFTTokenIdOwnersRequest, GetNFTTokenIdOwnersResponse, GetNFTTokenIdOwnersJSONResponse, getNFTTradesOperation, GetNFTTradesRequest, GetNFTTradesResponse, GetNFTTradesJSONResponse, getNFTTransfersByBlockOperation, GetNFTTransfersByBlockRequest, GetNFTTransfersByBlockResponse, GetNFTTransfersByBlockJSONResponse, getNFTTransfersFromToBlockOperation, GetNFTTransfersFromToBlockRequest, GetNFTTransfersFromToBlockResponse, GetNFTTransfersFromToBlockJSONResponse, getNFTTransfersOperation, GetNFTTransfersRequest, GetNFTTransfersResponse, GetNFTTransfersJSONResponse, getWalletNFTCollectionsOperation, GetWalletNFTCollectionsRequest, GetWalletNFTCollectionsResponse, GetWalletNFTCollectionsJSONResponse, getWalletNFTsOperation, GetWalletNFTsRequest, GetWalletNFTsResponse, GetWalletNFTsJSONResponse, getWalletNFTTransfersOperation, GetWalletNFTTransfersRequest, GetWalletNFTTransfersResponse, GetWalletNFTTransfersJSONResponse, reSyncMetadataOperation, ReSyncMetadataRequest, ReSyncMetadataResponse, ReSyncMetadataJSONResponse, searchNFTsOperation, SearchNFTsRequest, SearchNFTsResponse, SearchNFTsJSONResponse, syncNFTContractOperation, SyncNFTContractRequest, SyncNFTContractResponse, SyncNFTContractJSONResponse, getNativeBalanceOperation, GetNativeBalanceRequest, GetNativeBalanceResponse, GetNativeBalanceJSONResponse, getPairAddressOperation, GetPairAddressRequest, GetPairAddressResponse, GetPairAddressJSONResponse, getPairReservesOperation, GetPairReservesRequest, GetPairReservesResponse, GetPairReservesJSONResponse, getTokenAllowanceOperation, GetTokenAllowanceRequest, GetTokenAllowanceResponse, GetTokenAllowanceJSONResponse, getTokenMetadataBySymbolOperation, GetTokenMetadataBySymbolRequest, GetTokenMetadataBySymbolResponse, GetTokenMetadataBySymbolJSONResponse, getTokenMetadataOperation, GetTokenMetadataRequest, GetTokenMetadataResponse, GetTokenMetadataJSONResponse, getTokenPriceOperation, GetTokenPriceRequest, GetTokenPriceResponse, GetTokenPriceJSONResponse, getTokenTransfersOperation, GetTokenTransfersRequest, GetTokenTransfersResponse, GetTokenTransfersJSONResponse, getWalletTokenBalancesOperation, GetWalletTokenBalancesRequest, GetWalletTokenBalancesResponse, GetWalletTokenBalancesJSONResponse, getWalletTokenTransfersOperation, GetWalletTokenTransfersRequest, GetWalletTokenTransfersResponse, GetWalletTokenTransfersJSONResponse, getTransactionOperation, GetTransactionRequest, GetTransactionResponse, GetTransactionJSONResponse, getWalletTransactionsOperation, GetWalletTransactionsRequest, GetWalletTransactionsResponse, GetWalletTransactionsJSONResponse, resolveAddressOperation, ResolveAddressRequest, ResolveAddressResponse, ResolveAddressJSONResponse, resolveDomainOperation, ResolveDomainRequest, ResolveDomainResponse, ResolveDomainJSONResponse, uploadFolderOperation, UploadFolderRequest, UploadFolderResponse, UploadFolderJSONResponse } from '@moralisweb3/common-evm-utils';
 import { ClientRequestHandler } from '@moralisweb3/client-api-utils';
-import { PaginatedResponseAdapter, ResponseAdapter } from '@moralisweb3/common-core';
+import { ResponseAdapter, PaginatedResponseAdapter } from '@moralisweb3/common-core';
 
 export class ClientEvmApi {
   public constructor(
     private readonly requestHandler: ClientRequestHandler) {
   }
 
+  public readonly utils = {
+   endpointWeights: (request: EndpointWeightsRequest): Promise<ResponseAdapter<EndpointWeightsResponse, EndpointWeightsJSONResponse>> => {
+      return this.requestHandler.handle(request, endpointWeightsOperation);
+    },
+   runContractFunction: (request: RunContractFunctionRequest): Promise<ResponseAdapter<RunContractFunctionResponse, RunContractFunctionJSONResponse>> => {
+      return this.requestHandler.handle(request, runContractFunctionOperation);
+    },
+   web3ApiVersion: (request: Web3ApiVersionRequest): Promise<ResponseAdapter<Web3ApiVersionResponse, Web3ApiVersionJSONResponse>> => {
+      return this.requestHandler.handle(request, web3ApiVersionOperation);
+    },
+
+  };
+
+  public readonly block = {
+   getBlock: (request: GetBlockRequest): Promise<ResponseAdapter<GetBlockResponse, GetBlockJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, getBlockOperation);
+    },
+   getDateToBlock: (request: GetDateToBlockRequest): Promise<ResponseAdapter<GetDateToBlockResponse, GetDateToBlockJSONResponse>> => {
+      return this.requestHandler.handle(request, getDateToBlockOperation);
+    },
+
+  };
+
+  public readonly events = {
+   getContractEvents: (request: GetContractEventsRequest): Promise<PaginatedResponseAdapter<GetContractEventsResponse, GetContractEventsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getContractEventsOperation);
+    },
+   getContractLogs: (request: GetContractLogsRequest): Promise<PaginatedResponseAdapter<GetContractLogsResponse, GetContractLogsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getContractLogsOperation);
+    },
+
+  };
+
+  public readonly nft = {
+   getContractNFTs: (request: GetContractNFTsRequest): Promise<PaginatedResponseAdapter<GetContractNFTsResponse, GetContractNFTsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getContractNFTsOperation);
+    },
+   getNFTContractMetadata: (request: GetNFTContractMetadataRequest): Promise<ResponseAdapter<GetNFTContractMetadataResponse, GetNFTContractMetadataJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, getNFTContractMetadataOperation);
+    },
+   getNFTContractTransfers: (request: GetNFTContractTransfersRequest): Promise<PaginatedResponseAdapter<GetNFTContractTransfersResponse, GetNFTContractTransfersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTContractTransfersOperation);
+    },
+   getNFTLowestPrice: (request: GetNFTLowestPriceRequest): Promise<ResponseAdapter<GetNFTLowestPriceResponse, GetNFTLowestPriceJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, getNFTLowestPriceOperation);
+    },
+   getNFTMetadata: (request: GetNFTMetadataRequest): Promise<ResponseAdapter<GetNFTMetadataResponse, GetNFTMetadataJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, getNFTMetadataOperation);
+    },
+   getNFTOwners: (request: GetNFTOwnersRequest): Promise<PaginatedResponseAdapter<GetNFTOwnersResponse, GetNFTOwnersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTOwnersOperation);
+    },
+   getNFTTokenIdOwners: (request: GetNFTTokenIdOwnersRequest): Promise<PaginatedResponseAdapter<GetNFTTokenIdOwnersResponse, GetNFTTokenIdOwnersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTTokenIdOwnersOperation);
+    },
+   getNFTTrades: (request: GetNFTTradesRequest): Promise<PaginatedResponseAdapter<GetNFTTradesResponse, GetNFTTradesJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTTradesOperation);
+    },
+   getNFTTransfersByBlock: (request: GetNFTTransfersByBlockRequest): Promise<PaginatedResponseAdapter<GetNFTTransfersByBlockResponse, GetNFTTransfersByBlockJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTTransfersByBlockOperation);
+    },
+   getNFTTransfersFromToBlock: (request: GetNFTTransfersFromToBlockRequest): Promise<PaginatedResponseAdapter<GetNFTTransfersFromToBlockResponse, GetNFTTransfersFromToBlockJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTTransfersFromToBlockOperation);
+    },
+   getNFTTransfers: (request: GetNFTTransfersRequest): Promise<PaginatedResponseAdapter<GetNFTTransfersResponse, GetNFTTransfersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getNFTTransfersOperation);
+    },
+   getWalletNFTCollections: (request: GetWalletNFTCollectionsRequest): Promise<PaginatedResponseAdapter<GetWalletNFTCollectionsResponse, GetWalletNFTCollectionsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getWalletNFTCollectionsOperation);
+    },
+   getWalletNFTs: (request: GetWalletNFTsRequest): Promise<PaginatedResponseAdapter<GetWalletNFTsResponse, GetWalletNFTsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getWalletNFTsOperation);
+    },
+   getWalletNFTTransfers: (request: GetWalletNFTTransfersRequest): Promise<PaginatedResponseAdapter<GetWalletNFTTransfersResponse, GetWalletNFTTransfersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getWalletNFTTransfersOperation);
+    },
+   reSyncMetadata: (request: ReSyncMetadataRequest): Promise<ResponseAdapter<ReSyncMetadataResponse, ReSyncMetadataJSONResponse>> => {
+      return this.requestHandler.handle(request, reSyncMetadataOperation);
+    },
+   searchNFTs: (request: SearchNFTsRequest): Promise<PaginatedResponseAdapter<SearchNFTsResponse, SearchNFTsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, searchNFTsOperation);
+    },
+   syncNFTContract: (request: SyncNFTContractRequest): Promise<ResponseAdapter<SyncNFTContractResponse, SyncNFTContractJSONResponse>> => {
+      return this.requestHandler.handle(request, syncNFTContractOperation);
+    },
+
+  };
+
+  public readonly balance = {
+   getNativeBalance: (request: GetNativeBalanceRequest): Promise<ResponseAdapter<GetNativeBalanceResponse, GetNativeBalanceJSONResponse>> => {
+      return this.requestHandler.handle(request, getNativeBalanceOperation);
+    },
+
+  };
+
+  public readonly defi = {
+   getPairAddress: (request: GetPairAddressRequest): Promise<ResponseAdapter<GetPairAddressResponse, GetPairAddressJSONResponse>> => {
+      return this.requestHandler.handle(request, getPairAddressOperation);
+    },
+   getPairReserves: (request: GetPairReservesRequest): Promise<ResponseAdapter<GetPairReservesResponse, GetPairReservesJSONResponse>> => {
+      return this.requestHandler.handle(request, getPairReservesOperation);
+    },
+
+  };
+
   public readonly token = {
+   getTokenAllowance: (request: GetTokenAllowanceRequest): Promise<ResponseAdapter<GetTokenAllowanceResponse, GetTokenAllowanceJSONResponse>> => {
+      return this.requestHandler.handle(request, getTokenAllowanceOperation);
+    },
+   getTokenMetadataBySymbol: (request: GetTokenMetadataBySymbolRequest): Promise<ResponseAdapter<GetTokenMetadataBySymbolResponse, GetTokenMetadataBySymbolJSONResponse>> => {
+      return this.requestHandler.handle(request, getTokenMetadataBySymbolOperation);
+    },
+   getTokenMetadata: (request: GetTokenMetadataRequest): Promise<ResponseAdapter<GetTokenMetadataResponse, GetTokenMetadataJSONResponse>> => {
+      return this.requestHandler.handle(request, getTokenMetadataOperation);
+    },
+   getTokenPrice: (request: GetTokenPriceRequest): Promise<ResponseAdapter<GetTokenPriceResponse, GetTokenPriceJSONResponse>> => {
+      return this.requestHandler.handle(request, getTokenPriceOperation);
+    },
+   getTokenTransfers: (request: GetTokenTransfersRequest): Promise<PaginatedResponseAdapter<GetTokenTransfersResponse, GetTokenTransfersJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getTokenTransfersOperation);
+    },
+   getWalletTokenBalances: (request: GetWalletTokenBalancesRequest): Promise<ResponseAdapter<GetWalletTokenBalancesResponse, GetWalletTokenBalancesJSONResponse>> => {
+      return this.requestHandler.handle(request, getWalletTokenBalancesOperation);
+    },
    getWalletTokenTransfers: (request: GetWalletTokenTransfersRequest): Promise<PaginatedResponseAdapter<GetWalletTokenTransfersResponse, GetWalletTokenTransfersJSONResponse['result']>> => {
       return this.requestHandler.handlePaginated(request, getWalletTokenTransfersOperation);
     },
-   runContractFunction: (request: RunContractFunctionRequest): Promise<ResponseAdapter<RunContractFunctionResponse, RunContractFunctionJSONResponse>> => {
-      return this.requestHandler.handle(request, runContractFunctionOperation);
+
+  };
+
+  public readonly transaction = {
+   getTransaction: (request: GetTransactionRequest): Promise<ResponseAdapter<GetTransactionResponse, GetTransactionJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, getTransactionOperation);
+    },
+   getWalletTransactions: (request: GetWalletTransactionsRequest): Promise<PaginatedResponseAdapter<GetWalletTransactionsResponse, GetWalletTransactionsJSONResponse['result']>> => {
+      return this.requestHandler.handlePaginated(request, getWalletTransactionsOperation);
+    },
+
+  };
+
+  public readonly resolve = {
+   resolveAddress: (request: ResolveAddressRequest): Promise<ResponseAdapter<ResolveAddressResponse, ResolveAddressJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, resolveAddressOperation);
+    },
+   resolveDomain: (request: ResolveDomainRequest): Promise<ResponseAdapter<ResolveDomainResponse, ResolveDomainJSONResponse> | null> => {
+      return this.requestHandler.handleNullable(request, resolveDomainOperation);
+    },
+
+  };
+
+  public readonly ipfs = {
+   uploadFolder: (request: UploadFolderRequest): Promise<ResponseAdapter<UploadFolderResponse, UploadFolderJSONResponse>> => {
+      return this.requestHandler.handle(request, uploadFolderOperation);
     },
 
   };

packages/common/core/src/operations/Operation.ts

@@ -6,7 +6,7 @@ export interface Operation<Request, JSONRequest, Response, JSONResponse> {
   groupName: string;
   method: OperationRequestMethod;
   urlPathPattern: string;
-  urlPathParamNames: (keyof Request)[];
+  urlPathParamNames?: (keyof Request)[];
   urlSearchParamNames?: (keyof Request)[];
   bodyType?: OperationBodyType;
   bodyParamNames?: (keyof Request)[];
@@ -22,7 +22,7 @@ export interface Operation<Request, JSONRequest, Response, JSONResponse> {
 
 export type OperationRequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE';
 export type OperationBodyType = 'properties' | 'raw';
-export type OperationRequestUrlParams = Record<string, string | undefined>;
+export type OperationRequestUrlParams = Record<string, string | string[] | undefined>;
 export type OperationRequestBody = OperationRequestPropertiesBody | OperationRequestRawBody;
 export type OperationRequestPropertiesBody = Record<string, unknown>;
 export type OperationRequestRawBody = string | number | boolean | object;

packages/common/core/src/operations/OperationRequestValidator.ts

@@ -6,7 +6,7 @@ export class OperationRequestValidator<Request> {
 
   public constructor(operation: Operation<Request, unknown, unknown, unknown>) {
     this.allParamNames = [
-      ...operation.urlPathParamNames,
+      ...(operation.urlPathParamNames || []),
       ...(operation.urlSearchParamNames || []),
       ...(operation.bodyParamNames || []),
     ];

packages/common/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.ts

@@ -8,6 +8,8 @@ import { EvmTransactionLogData, EvmTransactionLogInput } from './types';
  */
 export type EvmTransactionLogish = EvmTransactionLogInput | EvmTransactionLog;
 
+export type LogTopic = string | null;
+
 /**
  * The EvmTransactionLog class is a MoralisData that references an EVM transaction log.
  *