Skip to content

Commit a0f721a

Browse files
yivladyivlad
authoredSep 19, 2022
🛥 Make ethers peer dependency (#791)
·
ethereum-waffle@4.0.10@ethereum-waffle/chai@4.0.8
1 parent c30876a commit a0f721a

File tree

12 files changed

+245
-87
lines changed

12 files changed

+245
-87
lines changed
 

‎.changeset/tasty-meals-pump.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@ethereum-waffle/chai": patch
3+
"ethereum-waffle": patch
4+
"@ethereum-waffle/compiler": patch
5+
"@ethereum-waffle/ens": patch
6+
"@ethereum-waffle/mock-contract": patch
7+
"@ethereum-waffle/optimism": patch
8+
"@ethereum-waffle/provider": patch
9+
---
10+
11+
Move ethers to peer deps

‎pnpm-lock.yaml

+199-57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎waffle-chai/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,17 @@
4343
},
4444
"dependencies": {
4545
"@ethereum-waffle/provider": "workspace:*",
46-
"debug": "^4.3.4",
47-
"ethers": "5.6.2"
46+
"debug": "^4.3.4"
4847
},
4948
"devDependencies": {
49+
"ethers": "5.6.2",
5050
"@types/debug": "^4.1.7",
5151
"mocha": "^8.2.1",
5252
"rimraf": "^3.0.2",
5353
"typescript": "^4.6.2",
5454
"eslint": "^7.14.0"
55+
},
56+
"peerDependencies": {
57+
"ethers": "*"
5558
}
5659
}

‎waffle-cli/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@
5353
"@ethereum-waffle/compiler": "workspace:*",
5454
"@ethereum-waffle/mock-contract": "workspace:*",
5555
"@ethereum-waffle/provider": "workspace:*",
56-
"ethers": "5.6.2",
5756
"solc": "0.8.15",
5857
"typechain": "^8.0.0"
5958
},
6059
"devDependencies": {
60+
"ethers": "5.6.2",
6161
"openzeppelin-solidity": "2.3.0",
6262
"mocha": "^8.2.1",
6363
"rimraf": "^3.0.2",
6464
"typescript": "^4.6.2",
6565
"eslint": "^7.14.0",
6666
"ts-node": "^9.0.0"
67+
},
68+
"peerDependencies": {
69+
"ethers": "*"
6770
}
6871
}

‎waffle-compiler/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
"node": ">=10.0"
4343
},
4444
"dependencies": {
45-
"@ethersproject/abi": "^5.6.1",
46-
"@ethersproject/bytes": "^5.6.1",
47-
"@ethersproject/providers": "^5.6.2",
4845
"@resolver-engine/imports": "^0.3.3",
4946
"@resolver-engine/imports-fs": "^0.3.3",
5047
"@typechain/ethers-v5": "^10.0.0",
@@ -69,7 +66,7 @@
6966
"eslint": "^7.14.0"
7067
},
7168
"peerDependencies": {
72-
"ethers": "5.6.2",
69+
"ethers": "*",
7370
"solc": "*",
7471
"typechain": "^8.0.0"
7572
}

‎waffle-ens/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@
4343
"engines": {
4444
"node": ">=10.0"
4545
},
46-
"dependencies": {
47-
"ethers": "5.6.2"
48-
},
4946
"devDependencies": {
47+
"ethers": "5.6.2",
5048
"@ensdomains/ens": "^0.4.4",
5149
"@ensdomains/resolver": "^0.2.4",
5250
"ganache": "7.4.0",
5351
"mocha": "^8.2.1",
5452
"rimraf": "^3.0.2",
5553
"typescript": "^4.6.2",
5654
"eslint": "^7.14.0"
55+
},
56+
"peerDependencies": {
57+
"ethers": "*"
5758
}
5859
}

‎waffle-hardhat/package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818
"engines": {
1919
"node": ">=10.0"
2020
},
21-
"dependencies": {
22-
"ethers": "5.6.2",
23-
"hardhat": "2.10.1"
24-
},
2521
"devDependencies": {
2622
"@ethereum-waffle/chai": "workspace:*",
2723
"@nomiclabs/hardhat-ethers": "2.1.0",
2824
"@nomiclabs/hardhat-waffle": "2.0.3",
2925
"@types/node": "^17.0.41",
3026
"eslint": "^7.14.0",
3127
"ethereum-waffle": "workspace:*",
32-
"mocha": "^8.2.1"
28+
"mocha": "^8.2.1",
29+
"ethers": "5.6.2",
30+
"hardhat": "2.10.1"
3331
}
3432
}

‎waffle-mock-contract/package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@
4646
"engines": {
4747
"node": ">=10.0"
4848
},
49-
"dependencies": {
50-
"@ethersproject/abi": "^5.6.1",
51-
"ethers": "5.6.2"
52-
},
5349
"devDependencies": {
50+
"ethers": "5.6.2",
51+
"@ethersproject/abi": "^5.6.1",
5452
"@ethereum-waffle/chai": "workspace:*",
5553
"@ethereum-waffle/compiler": "workspace:*",
5654
"solc": "0.8.15",
@@ -61,5 +59,8 @@
6159
"typescript": "^4.6.2",
6260
"eslint": "^7.14.0",
6361
"ts-node": "^9.0.0"
62+
},
63+
"peerDependencies": {
64+
"ethers": "*"
6465
}
6566
}

‎waffle-mock-contract/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {Contract, ContractFactory, Signer, utils} from 'ethers';
2-
import {Fragment, JsonFragment, FunctionFragment} from '@ethersproject/abi';
2+
import type {JsonFragment} from '@ethersproject/abi';
33

44
import DoppelgangerContract from './Doppelganger.json';
55

6-
type ABI = string | Array<Fragment | JsonFragment | string>
6+
type ABI = string | Array<utils.Fragment | JsonFragment | string>
77

88
export type Stub = ReturnType<typeof stub>;
99

@@ -65,7 +65,7 @@ export async function deployMockContract(signer: Signer, abi: ABI): Promise<Mock
6565
mockedContract.staticcall = async (contract: Contract, functionName: string, ...params: any[]) => {
6666
let func: utils.FunctionFragment = contract.interface.functions[functionName];
6767
if (!func) {
68-
func = Object.values(contract.interface.functions).find(f => f.name === functionName) as FunctionFragment;
68+
func = Object.values(contract.interface.functions).find(f => f.name === functionName) as utils.FunctionFragment;
6969
}
7070
if (!func) {
7171
throw new Error(`Unknown function ${functionName}`);

‎waffle-optimism/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
"engines": {
2626
"node": ">=10.0"
2727
},
28-
"dependencies": {
29-
"@ethersproject/providers": "^5.6.2",
30-
"ethers": "5.6.2"
31-
},
3228
"devDependencies": {
29+
"ethers": "5.6.2",
3330
"@ethereum-waffle/chai": "workspace:*",
3431
"@ethereum-waffle/provider": "workspace:*",
3532
"eslint": "^7.14.0",
3633
"ethereum-waffle": "workspace:*",
3734
"mocha": "^8.2.1",
3835
"rimraf": "^3.0.2",
3936
"typescript": "^4.6.2"
37+
},
38+
"peerDependencies": {
39+
"ethers": "*"
4040
}
4141
}

‎waffle-optimism/src/provider.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {JsonRpcProvider} from '@ethersproject/providers';
2-
import {BigNumber, Wallet} from 'ethers';
1+
import {BigNumber, Wallet, providers} from 'ethers';
32
import type {TestProvider} from '@ethereum-waffle/provider';
43

54
const privateKeys = [
@@ -24,7 +23,7 @@ const privateKeys = [
2423
'0xdf57089febbacf7ba0bc227dafbffa9fc08a93fdc68e1e42411a14efcf23656e'
2524
];
2625

27-
export class OptimismProvider extends JsonRpcProvider implements TestProvider {
26+
export class OptimismProvider extends providers.JsonRpcProvider implements TestProvider {
2827
getWallets(): Wallet[] {
2928
return privateKeys.map(key => new Wallet(key, this));
3029
}

‎waffle-provider/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,20 @@
4545
"@ethereum-waffle/ens": "workspace:*",
4646
"@ganache/ethereum-options": "0.1.4",
4747
"debug": "^4.3.4",
48-
"ethers": "5.6.2",
4948
"ganache": "7.4.0"
5049
},
5150
"resolutions": {
5251
"web3": "1.2.4"
5352
},
5453
"devDependencies": {
54+
"ethers": "5.6.2",
5555
"@types/debug": "^4.1.7",
5656
"eslint": "^7.14.0",
5757
"mocha": "^8.2.1",
5858
"rimraf": "^3.0.2",
5959
"typescript": "^4.6.2"
60+
},
61+
"peerDependencies": {
62+
"ethers": "*"
6063
}
6164
}

0 commit comments

Comments
 (0)
Please sign in to comment.