Commit 567679b 1 parent eb32993 commit 567679b Copy full SHA for 567679b
File tree 9 files changed +396
-901
lines changed
9 files changed +396
-901
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ sort_imports = true
10
10
11
11
[profile .default ]
12
12
solc_version = ' 0.8.23'
13
- libs = [' node_modules' ]
13
+ libs = [' node_modules' , ' lib ' ]
14
14
optimizer_runs = 10_000
15
15
16
16
[profile .optimized ]
Original file line number Diff line number Diff line change 32
32
"test/**/*.sol" : " yarn lint:sol-tests" ,
33
33
"package.json" : " sort-package-json"
34
34
},
35
- "dependencies" : {
36
- "isolmate" : " github:defi-wonderland/isolmate#59e1804"
37
- },
38
35
"devDependencies" : {
39
- "@commitlint/cli" : " 17.0.3 " ,
40
- "@commitlint/config-conventional" : " 17.0.3 " ,
41
- "@defi-wonderland/natspec-smells" : " 1.0.3 " ,
36
+ "@commitlint/cli" : " 19.3.0 " ,
37
+ "@commitlint/config-conventional" : " 19.2.2 " ,
38
+ "@defi-wonderland/natspec-smells" : " 1.1.1 " ,
42
39
"ds-test" : " github:dapphub/ds-test#e282159" ,
43
- "forge-std" : " github:foundry-rs/forge-std#4513bc2 " ,
40
+ "forge-std" : " github:foundry-rs/forge-std#5475f85 " ,
44
41
"husky" : " >=8" ,
45
42
"lint-staged" : " >=10" ,
46
- "solhint" : " github:solhint-community/solhint-community#v4 .0.0-rc01 " ,
47
- "sort-package-json" : " 1.53.1 "
43
+ "solhint-community " : " 4 .0.0" ,
44
+ "sort-package-json" : " 2.10.0 "
48
45
}
49
46
}
Original file line number Diff line number Diff line change 1
1
ds-test/=node_modules/ds-test/src
2
2
forge-std/=node_modules/forge-std/src
3
- isolmate /=node_modules/isolmate /src
3
+ solmate /=node_modules/solmate /src
4
4
5
5
contracts/=src/contracts
6
6
interfaces/=src/interfaces
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ pragma solidity 0.8.23;
3
3
4
4
import {Greeter} from 'contracts/Greeter.sol ' ;
5
5
import {Script} from 'forge-std/Script.sol ' ;
6
- import {IERC20 } from 'isolmate /interfaces/tokens /IERC20.sol ' ;
6
+ import {IERC20 } from 'forge-std /interfaces/IERC20.sol ' ;
7
7
8
8
contract Deploy is Script {
9
9
struct DeploymentParams {
Original file line number Diff line number Diff line change 1
1
// SPDX-License-Identifier: MIT
2
2
pragma solidity 0.8.23 ;
3
3
4
+ import {IERC20 } from 'forge-std/interfaces/IERC20.sol ' ;
4
5
import {IGreeter} from 'interfaces/IGreeter.sol ' ;
5
- import {IERC20 } from 'isolmate/interfaces/tokens/IERC20.sol ' ;
6
6
7
7
contract Greeter is IGreeter {
8
8
/**
Original file line number Diff line number Diff line change 1
1
// SPDX-License-Identifier: MIT
2
2
pragma solidity 0.8.23 ;
3
3
4
- import {IERC20 } from 'isolmate /interfaces/tokens /IERC20.sol ' ;
4
+ import {IERC20 } from 'forge-std /interfaces/IERC20.sol ' ;
5
5
6
6
/**
7
7
* @title Greeter Contract
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ pragma solidity 0.8.23;
3
3
4
4
import {Greeter, IGreeter} from 'contracts/Greeter.sol ' ;
5
5
import {Test} from 'forge-std/Test.sol ' ;
6
- import {IERC20 } from 'isolmate /interfaces/tokens /IERC20.sol ' ;
6
+ import {IERC20 } from 'forge-std /interfaces/IERC20.sol ' ;
7
7
8
8
contract IntegrationBase is Test {
9
9
uint256 internal constant _FORK_BLOCK = 18_920_905 ;
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ pragma solidity 0.8.23;
3
3
4
4
import {Greeter, IGreeter} from 'contracts/Greeter.sol ' ;
5
5
import {Test} from 'forge-std/Test.sol ' ;
6
- import {IERC20 } from 'isolmate /interfaces/tokens /IERC20.sol ' ;
6
+ import {IERC20 } from 'forge-std /interfaces/IERC20.sol ' ;
7
7
8
8
abstract contract Base is Test {
9
9
address internal _owner = makeAddr ('owner ' );
You can’t perform that action at this time.
0 commit comments