Skip to content

Commit

Permalink
chore: updating packages and deprecating wonderlands isolmate (#66)
Browse files Browse the repository at this point in the history
Co-authored-by: Gas One Cent <[email protected]>
  • Loading branch information
wei3erHase and gas1cent authored May 8, 2024
1 parent eb32993 commit 567679b
Show file tree
Hide file tree
Showing 9 changed files with 396 additions and 901 deletions.
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sort_imports = true

[profile.default]
solc_version = '0.8.23'
libs = ['node_modules']
libs = ['node_modules', 'lib']
optimizer_runs = 10_000

[profile.optimized]
Expand Down
15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,15 @@
"test/**/*.sol": "yarn lint:sol-tests",
"package.json": "sort-package-json"
},
"dependencies": {
"isolmate": "github:defi-wonderland/isolmate#59e1804"
},
"devDependencies": {
"@commitlint/cli": "17.0.3",
"@commitlint/config-conventional": "17.0.3",
"@defi-wonderland/natspec-smells": "1.0.3",
"@commitlint/cli": "19.3.0",
"@commitlint/config-conventional": "19.2.2",
"@defi-wonderland/natspec-smells": "1.1.1",
"ds-test": "github:dapphub/ds-test#e282159",
"forge-std": "github:foundry-rs/forge-std#4513bc2",
"forge-std": "github:foundry-rs/forge-std#5475f85",
"husky": ">=8",
"lint-staged": ">=10",
"solhint": "github:solhint-community/solhint-community#v4.0.0-rc01",
"sort-package-json": "1.53.1"
"solhint-community": "4.0.0",
"sort-package-json": "2.10.0"
}
}
2 changes: 1 addition & 1 deletion remappings.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ds-test/=node_modules/ds-test/src
forge-std/=node_modules/forge-std/src
isolmate/=node_modules/isolmate/src
solmate/=node_modules/solmate/src

contracts/=src/contracts
interfaces/=src/interfaces
2 changes: 1 addition & 1 deletion script/Deploy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.23;

import {Greeter} from 'contracts/Greeter.sol';
import {Script} from 'forge-std/Script.sol';
import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
import {IERC20} from 'forge-std/interfaces/IERC20.sol';

contract Deploy is Script {
struct DeploymentParams {
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/Greeter.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.23;

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

contract Greeter is IGreeter {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IGreeter.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.23;

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

/**
* @title Greeter Contract
Expand Down
2 changes: 1 addition & 1 deletion test/integration/IntegrationBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.23;

import {Greeter, IGreeter} from 'contracts/Greeter.sol';
import {Test} from 'forge-std/Test.sol';
import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
import {IERC20} from 'forge-std/interfaces/IERC20.sol';

contract IntegrationBase is Test {
uint256 internal constant _FORK_BLOCK = 18_920_905;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Greeter.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.23;

import {Greeter, IGreeter} from 'contracts/Greeter.sol';
import {Test} from 'forge-std/Test.sol';
import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
import {IERC20} from 'forge-std/interfaces/IERC20.sol';

abstract contract Base is Test {
address internal _owner = makeAddr('owner');
Expand Down
Loading

0 comments on commit 567679b

Please sign in to comment.