#16 updated yarn to yarn 2 berry. fixed some build errors

.github/workflows/pr-workflow.yml

@@ -33,7 +33,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
       - run: yarn run build
       - run: yarn hardhat:test
       - name: Publish Unit Test Results

.yarnrc.yml

@@ -2,6 +2,8 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
 
 yarnPath: .yarn/releases/yarn-berry.js
+
+nmHoistingLimits: 'dependencies'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eth-components",
-  "version": "2.1.0beta17",
+  "version": "2.1.0-beta18",
   "description": "A set of react components to turbocharge buidling",
   "author": "Austin Griffith <austin@ethereum.org>",
   "repository": "https://github.com/scaffold-eth/eth-components.git",
@@ -25,7 +25,7 @@
   "scripts": {
     "watch": "ts-patch i && tsc -w --noEmit",
     "clean": "shx rm -rf ./lib",
-    "build": "yarn clean && ts-patch i && yarn mkdirp lib && yarn shx cp -r src lib/src.ts && tsc -p tsconfig.build.json",
+    "build": "yarn clean && ts-patch i && yarn shx mkdir lib && yarn shx cp -r src lib/src.ts && tsc -p tsconfig.build.json",
     "package": "shx cp -R package.json ./lib && shx cp -R README.md ./lib",
     "prepublish": "yarn clean && yarn build && yarn package",
     "publish:yalc": "yarn prepublish && cd lib && yalc publish --no-script --push",
@@ -58,7 +58,7 @@
     "@uniswap/token-lists": "^1.0.0-beta.24",
     "axios": "^0.21.4",
     "bnc-notify": "^1.9.1",
-    "eth-hooks": "^3.2.0-beta21",
+    "eth-hooks": "^3.2.0-beta24",
     "ethers": "^5.4.1",
     "qrcode.react": "^1.0.1",
     "react-blockies": "^1.4.1",

src/ant/Faucet.tsx

@@ -69,8 +69,8 @@ export const Faucet: FC<IFaucetProps> = (props) => {
     [props.mainnetProvider]
   );
 
-  const signer = props.localProvider.getSigner(address);
-  const tx = transactor(context, signer);
+  const localSigner = props.localProvider.getSigner(address);
+  const tx = transactor(context, localSigner);
 
   return (
     <span>
@@ -101,7 +101,7 @@ export const Faucet: FC<IFaucetProps> = (props) => {
             />
             <Wallet
               color="#888888"
-              signer={signer}
+              signer={localSigner}
               localProvider={props.localProvider}
               ensProvider={props.mainnetProvider}
               price={props.price}

src/ant/Wallet.tsx

@@ -4,7 +4,8 @@ import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { parseEther } from '@ethersproject/units';
 import { Button, Modal, Spin, Tooltip, Typography } from 'antd';
 import { useBurnerSigner, useUserAddress } from 'eth-hooks';
-import { BytesLike, Signer } from 'ethers';
+import { TEthersSigner } from 'eth-hooks/models';
+import { BytesLike } from 'ethers';
 import QR from 'qrcode.react';
 import React, { FC, useContext, useState } from 'react';
 
@@ -16,7 +17,7 @@ import { EthComponentsContext } from '~~/models';
 const { Text, Paragraph } = Typography;
 
 interface IWalletProps {
-  signer: Signer | undefined;
+  signer: TEthersSigner | undefined;
   ensProvider: StaticJsonRpcProvider | undefined;
   localProvider: StaticJsonRpcProvider | undefined;
   price: number;

src/functions/transactor.ts

@@ -2,7 +2,8 @@ import { TransactionRequest, TransactionResponse } from '@ethersproject/provider
 import { notification } from 'antd';
 import Notify, { API, InitOptions } from 'bnc-notify';
 import { parseProviderOrSigner } from 'eth-hooks/functions';
-import { BigNumber, ethers, Signer } from 'ethers';
+import { TEthersSigner } from 'eth-hooks/models';
+import { BigNumber, ethers } from 'ethers';
 import { Deferrable } from 'ethers/lib/utils';
 
 import { checkBlocknativeAppId, IEthComponentsContext } from '~~/models/EthComponentsContext';
@@ -26,7 +27,7 @@ export type TTransactor = (
  */
 export const transactor = (
   context: IEthComponentsContext,
-  signer: Signer | undefined,
+  signer: TEthersSigner | undefined,
   gasPrice?: number,
   etherscan?: string,
   throwOnError: boolean = false

yarn.lock

@@ -6393,7 +6393,7 @@ __metadata:
     eslint-plugin-react-hooks: ^4.2.0
     eslint-plugin-testing-library: ^4.12.3
     eslint-plugin-unused-imports: ^1.1.2
-    eth-hooks: ^3.2.0-beta21
+    eth-hooks: ^3.2.0-beta24
     ethereum-waffle: ^3.4.0
     ethers: ^5.4.1
     global-jsdom: ^8.2.0
@@ -6466,9 +6466,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-hooks@npm:^3.2.0-beta21":
-  version: 3.2.0-beta21
-  resolution: "eth-hooks@npm:3.2.0-beta21"
+"eth-hooks@npm:^3.2.0-beta24":
+  version: 3.2.0-beta24
+  resolution: "eth-hooks@npm:3.2.0-beta24"
   dependencies:
     "@ethersproject/address": ^5.4.0
     "@ethersproject/bignumber": ^5.4.0
@@ -6493,7 +6493,7 @@ __metadata:
     "@uniswap/sdk": ^3.0.3
     react: ">=17.0.2"
     react-dom: ">=17.0.2"
-  checksum: ba1c934e8fa77b42099bc1b93f63e8811795c5b6cf6a5fb9e05cfb6a354788ed297acf4d84fb3038dc6f3f1614d7411d0d71dd5cf29c994b58494106e49fcd4e
+  checksum: 11eeb7946df2f0a4bf89661a47a2b982a99208f34fee4531b28687280c5fd612a567d3ddc03fdaf4e7123ce11408c71a2cc2831e781379838c86cf0e09cf4f39
   languageName: node
   linkType: hard