Replace ethers with @ethersproject/...

packages/client/package.json

@@ -68,10 +68,13 @@
     "typescript": "^4.6.2"
   },
   "dependencies": {
+    "@ethersproject/abi": "^5.7.0",
     "@ethersproject/abstract-signer": "^5.7.0",
     "@ethersproject/bignumber": "^5.7.0",
+    "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/constants": "^5.7.0",
     "@ethersproject/contracts": "^5.7.0",
+    "@ethersproject/keccak256": "^5.7.0",
     "@ethersproject/networks": "npm:boa-networks@^5.7.2",
     "@ethersproject/providers": "^5.7.0",
     "@ethersproject/wallet": "^5.7.0",

packages/client/src/client-common/context.ts

@@ -1,5 +1,6 @@
-import { ContextParams, ContextState } from "./interfaces/context";
 import { JsonRpcProvider, Networkish } from "@ethersproject/providers";
+
+import { ContextParams, ContextState } from "./interfaces/context";
 import { UnsupportedProtocolError } from "del-sdk-common";
 import { activeContractsList } from "del-osx-lib";
 

packages/client/src/client-common/modules/web3.ts

@@ -1,8 +1,9 @@
-import { Context } from "../context";
-import { Wallet } from "@ethersproject/wallet";
-import { JsonRpcProvider } from "@ethersproject/providers";
-import { Contract, ContractInterface } from "@ethersproject/contracts";
 import { Signer } from "@ethersproject/abstract-signer";
+import { Contract, ContractInterface } from "@ethersproject/contracts";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { Wallet } from "@ethersproject/wallet";
+
+import { Context } from "../context";
 import { IClientWeb3Core } from "../interfaces/core";
 import { NoLinkCollection } from "del-sdk-common";
 import { GenericRecord, IHttpConfig } from "../interfaces/common";

packages/client/src/index.ts

@@ -1,5 +1,5 @@
 export { Client } from "./client";
 export * from "./client-common";
-export { AddRequestValue, IdParams, ToAddressParams, ToEmailParams, NonceOfParams } from "./interfaces";
+export { AddRequestValue } from "./interfaces";
 export * from "./utils/ContractUtils";
 export * from "./utils/Amount";

packages/client/src/interfaces.ts

@@ -1,5 +1,6 @@
+import { BigNumber } from "@ethersproject/bignumber";
+
 import { IClientCore } from "./client-common/interfaces/core";
-import { BigNumber } from "ethers";
 
 /** Defines the shape of the general purpose Client class */
 export interface IClientMethods extends IClientCore {
@@ -18,22 +19,6 @@ export interface IClient {
     methods: IClientMethods;
 }
 
-export type IdParams = {
-    id: string;
-};
-
-export type ToAddressParams = {
-    email: string;
-};
-
-export type ToEmailParams = {
-    wallet: string;
-};
-
-export type NonceOfParams = {
-    wallet: string;
-};
-
 export type ValidatorInfoValue = {
     address: string;
     index: number;

packages/client/src/internal/client/methods.ts

@@ -1,3 +1,6 @@
+import { Contract } from "@ethersproject/contracts";
+import { BigNumber } from "@ethersproject/bignumber";
+
 import { LinkCollection__factory } from "del-osx-lib";
 import { NoProviderError, NoSignerError } from "del-sdk-common";
 
@@ -12,8 +15,6 @@ import {
 
 import { ClientCore, Context, IHttpConfig } from "../../client-common";
 import { ContractUtils } from "../../utils/ContractUtils";
-import { BigNumber } from "ethers";
-import { Contract } from "@ethersproject/contracts";
 import {
     AlreadyRegisteredAddress,
     AlreadyRegisteredEmail,

packages/client/src/utils/Amount.ts

@@ -9,7 +9,7 @@
  *       MIT License. See LICENSE for details.
  */
 
-import { BigNumber } from "ethers";
+import { BigNumber } from "@ethersproject/bignumber";
 
 /**
  * The class that defines the Amount

packages/client/src/utils/ContractUtils.ts

@@ -7,10 +7,14 @@
  *  License:
  *       MIT License. See LICENSE for details.
  */
+import { defaultAbiCoder } from "@ethersproject/abi";
+import { Signer } from "@ethersproject/abstract-signer";
+import { BigNumberish } from "@ethersproject/bignumber";
+import { arrayify } from "@ethersproject/bytes";
+import { keccak256 } from "@ethersproject/keccak256";
+import { verifyMessage } from "@ethersproject/wallet";
 
 import * as crypto from "crypto";
-import { BigNumberish, ethers, Signer } from "ethers";
-import { arrayify } from "ethers/lib/utils";
 
 export class ContractUtils {
     /**
@@ -61,19 +65,19 @@ export class ContractUtils {
     }
 
     public static getRequestId(emailHash: string, address: string, nonce: BigNumberish): string {
-        const encodedResult = ethers.utils.defaultAbiCoder.encode(
+        const encodedResult = defaultAbiCoder.encode(
             ["bytes32", "address", "uint256", "bytes32"],
             [emailHash, address, nonce, crypto.randomBytes(32)]
         );
-        return ethers.utils.keccak256(encodedResult);
+        return keccak256(encodedResult);
     }
 
     public static getRequestHash(email: string, address: string, nonce: BigNumberish): Uint8Array {
-        const encodedResult = ethers.utils.defaultAbiCoder.encode(
+        const encodedResult = defaultAbiCoder.encode(
             ["bytes32", "address", "uint256"],
             [ContractUtils.sha256String(email), address, nonce]
         );
-        return arrayify(ethers.utils.keccak256(encodedResult));
+        return arrayify(keccak256(encodedResult));
     }
 
     public static async signRequestData(signer: Signer, email: string, nonce: BigNumberish): Promise<string> {
@@ -85,7 +89,7 @@ export class ContractUtils {
         const message = ContractUtils.getRequestHash(email, address, nonce);
         let res: string;
         try {
-            res = ethers.utils.verifyMessage(message, signature);
+            res = verifyMessage(message, signature);
         } catch (error) {
             return false;
         }

packages/client/test/client.test.ts

@@ -1,5 +1,6 @@
 import { JsonRpcProvider } from "@ethersproject/providers";
 import { Wallet } from "@ethersproject/wallet";
+
 import { Client, Context } from "../src";
 import { contextParamsMainnet, web3endpoints } from "./helper/constants";
 

packages/client/test/helper/GanacheServer.ts

@@ -1,10 +1,10 @@
 import ganache, { Server } from "ganache";
 import * as dotenv from "dotenv";
-import { Wallet } from "ethers";
-import { JsonRpcProvider } from "@ethersproject/providers";
 import { contextParamsLocalChain } from "./constants";
 import { LIVE_CONTRACTS } from "../../src";
 import { Signer } from "@ethersproject/abstract-signer";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { Wallet } from "@ethersproject/wallet";
 
 dotenv.config({ path: "env/.env" });
 

packages/client/test/helper/constants.ts

@@ -1,4 +1,5 @@
 import { Wallet } from "@ethersproject/wallet";
+
 import { ContextParams } from "../../src";
 
 export const web3endpoints = {

packages/client/test/methods.test.ts

@@ -1,10 +1,11 @@
+import { BigNumber } from "@ethersproject/bignumber";
+
 import { Server } from "ganache";
 import { GanacheServer } from "./helper/GanacheServer";
 import { contextParamsLocalChain } from "./helper/constants";
 import { FakerValidator } from "./helper/FakerValidator";
 import { Client, Context, ContractUtils } from "../src";
 import { AddRequestSteps } from "../src/interfaces";
-import { BigNumber } from "ethers";
 import { ContractDeployer, Deployment } from "./helper/ContractDeployer";
 import { RegisterSteps } from "../src/interfaces";