Skip to content

Commit 567679b

Browse files
wei3erHasegas1cent
andauthored
chore: updating packages and deprecating wonderlands isolmate (#66)
Co-authored-by: Gas One Cent <86567384+gas1cent@users.noreply.github.com>
1 parent eb32993 commit 567679b

File tree

9 files changed

+396
-901
lines changed

9 files changed

+396
-901
lines changed

foundry.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sort_imports = true
1010

1111
[profile.default]
1212
solc_version = '0.8.23'
13-
libs = ['node_modules']
13+
libs = ['node_modules', 'lib']
1414
optimizer_runs = 10_000
1515

1616
[profile.optimized]

package.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,15 @@
3232
"test/**/*.sol": "yarn lint:sol-tests",
3333
"package.json": "sort-package-json"
3434
},
35-
"dependencies": {
36-
"isolmate": "github:defi-wonderland/isolmate#59e1804"
37-
},
3835
"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",
4239
"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",
4441
"husky": ">=8",
4542
"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"
4845
}
4946
}

remappings.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ds-test/=node_modules/ds-test/src
22
forge-std/=node_modules/forge-std/src
3-
isolmate/=node_modules/isolmate/src
3+
solmate/=node_modules/solmate/src
44

55
contracts/=src/contracts
66
interfaces/=src/interfaces

script/Deploy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
33

44
import {Greeter} from 'contracts/Greeter.sol';
55
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';
77

88
contract Deploy is Script {
99
struct DeploymentParams {

src/contracts/Greeter.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.23;
33

4+
import {IERC20} from 'forge-std/interfaces/IERC20.sol';
45
import {IGreeter} from 'interfaces/IGreeter.sol';
5-
import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
66

77
contract Greeter is IGreeter {
88
/**

src/interfaces/IGreeter.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.23;
33

4-
import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
4+
import {IERC20} from 'forge-std/interfaces/IERC20.sol';
55

66
/**
77
* @title Greeter Contract

test/integration/IntegrationBase.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
33

44
import {Greeter, IGreeter} from 'contracts/Greeter.sol';
55
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';
77

88
contract IntegrationBase is Test {
99
uint256 internal constant _FORK_BLOCK = 18_920_905;

test/unit/Greeter.t.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
33

44
import {Greeter, IGreeter} from 'contracts/Greeter.sol';
55
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';
77

88
abstract contract Base is Test {
99
address internal _owner = makeAddr('owner');

0 commit comments

Comments
 (0)