refactor: consolidate InvalidcontractAddressError into @taquito/core …

…and improve across packages

re #1994

packages/taquito-core/src/errors.ts

@@ -161,3 +161,16 @@ export class InvalidSignatureError extends ParameterValidationError {
     errorDetail ? (this.message += ` ${errorDetail}`) : null;
   }
 }
+
+/**
+ *  @category Error
+ *  @description Error indicates an invalid contract address being passed or used
+ */
+export class InvalidContractAddressError extends ParameterValidationError {
+  constructor(public contractAddress: string, errorDetail?: string) {
+    super();
+    this.name = 'InvalidContractAddressError';
+    this.message = `The contract address '${contractAddress}' is invalid.`;
+    errorDetail ? (this.message += ` ${errorDetail}`) : null;
+  }
+}

packages/taquito-local-forging/src/codec.ts

@@ -7,7 +7,6 @@ import {
   prefixLength,
   InvalidKeyHashError,
   InvalidPublicKeyError,
-  InvalidContractAddressError,
 } from '@taquito/utils';
 import {
   OversizedEntryPointError,
@@ -29,7 +28,7 @@ import {
 } from './michelson/codec';
 import { Uint8ArrayConsumer } from './uint8array-consumer';
 import { pad } from './utils';
-import { InvalidAddressError } from '@taquito/core';
+import { InvalidAddressError, InvalidContractAddressError } from '@taquito/core';
 
 // https://tezos.gitlab.io/shell/p2p_api.html specifies data types and structure for forging
 

packages/taquito-rpc/src/rpc-client-modules/rpc-cache.ts

@@ -52,13 +52,8 @@ import {
   PendingOperations,
   OriginationProofParams,
 } from '../types';
-import { InvalidAddressError } from '@taquito/core';
-import {
-  InvalidContractAddressError,
-  validateContractAddress,
-  validateAddress,
-  ValidationResult,
-} from '@taquito/utils';
+import { InvalidAddressError, InvalidContractAddressError } from '@taquito/core';
+import { validateContractAddress, validateAddress, ValidationResult } from '@taquito/utils';
 
 interface CachedDataInterface {
   [key: string]: {
@@ -229,7 +224,7 @@ export class RpcClientCache implements RpcClientInterface {
    *
    * @param address contract address from which we want to retrieve the storage
    * @param options contains generic configuration for rpc calls
-   *
+   * @throws {@link InvalidContractAddressError}
    * @description Access the data of the contract.
    *
    * @see https://tezos.gitlab.io/api/rpc.html#get-block-id-context-contracts-contract-id-storage
@@ -256,7 +251,7 @@ export class RpcClientCache implements RpcClientInterface {
    *
    * @param address contract address from which we want to retrieve the script
    * @param options contains generic configuration for rpc calls
-   *
+   * @throws {@link InvalidContractAddressError}
    * @description Access the code and data of the contract.
    *
    * @see https://tezos.gitlab.io/api/rpc.html#get-block-id-context-contracts-contract-id-script
@@ -284,7 +279,7 @@ export class RpcClientCache implements RpcClientInterface {
    * @param address contract address from which we want to retrieve the script
    * @param unparsingMode default is { unparsing_mode: "Readable" }
    * @param options contains generic configuration for rpc calls
-   *
+   * @throws {@link InvalidContractAddressError}
    * @description Access the script of the contract and normalize it using the requested unparsing mode.
    *
    */
@@ -824,7 +819,7 @@ export class RpcClientCache implements RpcClientInterface {
    * @param contract address of the contract we want to get the entrypoints of
    *
    * @description Return the list of entrypoints of the contract
-   *
+   * @throws {@link InvalidContractAddressError}
    * @see https://tezos.gitlab.io/api/rpc.html#get-block-id-context-contracts-contract-id-entrypoints
    *
    * @version 005_PsBABY5H

packages/taquito-utils/src/errors.ts

@@ -6,19 +6,9 @@ export {
   InvalidKeyError,
   InvalidPublicKeyError,
   InvalidSignatureError,
+  InvalidContractAddressError,
 } from '@taquito/core';
 
-/**
- *  @category Error
- *  @description Error that indicates an invalid contract address being passed or used
- */
-export class InvalidContractAddressError extends Error {
-  public name = 'InvalidContractAddressError';
-  constructor(public contractAddress: string) {
-    super(`The contract address '${contractAddress}' is invalid`);
-  }
-}
-
 /**
  *  @category Error
  *  @description Error that indicates an invalid chain id being passed or used

packages/taquito/src/contract/rpc-contract-provider.ts

@@ -54,12 +54,7 @@ import {
   createSmartRollupOriginateOperation,
 } from './prepare';
 import { smartContractAbstractionSemantic } from './semantic';
-import {
-  validateAddress,
-  validateContractAddress,
-  InvalidContractAddressError,
-  ValidationResult,
-} from '@taquito/utils';
+import { validateAddress, validateContractAddress, ValidationResult } from '@taquito/utils';
 import { EstimationProvider } from '../estimate/estimate-provider-interface';
 import { TxRollupOriginationOperation } from '../operations/tx-rollup-origination-operation';
 import { TxRollupBatchOperation } from '../operations/tx-rollup-batch-operation';
@@ -71,7 +66,7 @@ import { ProposalsOperation } from '../operations/proposals-operation';
 import { UpdateConsensusKeyOperation } from '../operations/update-consensus-key-operation';
 import { SmartRollupAddMessagesOperation } from '../operations/smart-rollup-add-messages-operation';
 import { SmartRollupOriginateOperation } from '../operations/smart-rollup-originate-operation';
-import { InvalidAddressError } from '@taquito/core';
+import { InvalidAddressError, InvalidContractAddressError } from '@taquito/core';
 
 export class RpcContractProvider
   extends OperationEmitter
@@ -88,7 +83,7 @@ export class RpcContractProvider
    *
    * @param contract contract address you want to get the storage from
    * @param schema optional schema can either be the contract script rpc response or a michelson-encoder schema
-   *
+   * @throws {@link InvalidContractAddressError}
    * @see https://tezos.gitlab.io/api/rpc.html#get-block-id-context-contracts-contract-id-script
    */
   async getStorage<T>(contract: string, schema?: ContractSchema): Promise<T> {
@@ -117,7 +112,7 @@ export class RpcContractProvider
    * @param contract contract address you want to get the storage from
    * @param key contract big map key to fetch value from
    * @param schema optional schema can either be the contract script rpc response or a michelson-encoder schema
-   *
+   * @throws {@link InvalidContractAddressError}
    * @deprecated Deprecated in favor of getBigMapKeyByID
    *
    * @see https://tezos.gitlab.io/api/rpc.html#post-block-id-context-contracts-contract-id-big-map-get
@@ -769,7 +764,13 @@ export class RpcContractProvider
       context
     );
   }
-
+  /**
+   *
+   * @description Create an smart contract abstraction for the address specified.
+   *
+   * @param address Smart contract address
+   * @throws {@link InvalidContractAddressError}
+   */
   async at<T extends DefaultContractType = DefaultContractType>(
     address: string,
     contractAbstractionComposer: ContractAbstractionComposer<T> = (x) => x as any

packages/taquito/src/wallet/wallet.ts

@@ -16,11 +16,10 @@ import {
   WalletProvider,
   WalletTransferParams,
 } from './interface';
-import { InvalidAddressError } from '@taquito/core';
+import { InvalidAddressError, InvalidContractAddressError } from '@taquito/core';
 import {
   validateAddress,
   validateContractAddress,
-  InvalidContractAddressError,
   ValidationResult,
   InvalidOperationKindError,
 } from '@taquito/utils';
@@ -333,6 +332,7 @@ export class Wallet {
    * smart contract abstraction will leverage the wallet provider to make smart contract calls
    *
    * @param address Smart contract address
+   * @throws {@link InvalidContractAddressError} If the contract address is not valid
    */
   async at<T extends ContractAbstraction<Wallet>>(
     address: string,