Skip to content

Commit 6520694

Browse files
PeterMPhillipsPeterMPhillips
committed
update dependencies
1 parent 63b3b91 commit 6520694

26 files changed

+509
-40
lines changed

‎.gitmodules

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "lib/forge-std"]
22
path = lib/forge-std
3-
url = https://github.com/foundry/forge-std
3+
url = https://github.com/foundry-rs/forge-std
44
branch = v1.9.6
55
[submodule "lib/enso-weiroll"]
66
path = lib/enso-weiroll
@@ -11,3 +11,18 @@
1111
[submodule "lib/solady"]
1212
path = lib/solady
1313
url = https://github.com/Vectorized/solady
14+
[submodule "lib/openzeppelin-contracts"]
15+
path = lib/openzeppelin-contracts
16+
url = https://github.com/openzeppelin/openzeppelin-contracts
17+
[submodule "lib/layerzero-v2"]
18+
path = lib/layerzero-v2
19+
url = https://github.com/LayerZero-Labs/layerzero-v2
20+
[submodule "lib/devtools"]
21+
path = lib/devtools
22+
url = https://github.com/LayerZero-Labs/devtools
23+
[submodule "lib/v4-core"]
24+
path = lib/v4-core
25+
url = https://github.com/uniswap/v4-core
26+
[submodule "lib/v4-periphery"]
27+
path = lib/v4-periphery
28+
url = https://github.com/uniswap/v4-periphery

‎foundry.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[profile.default]
2-
evm_version = "prague"
32
src = 'src'
43
out = 'out'
54
libs = ['lib']
65
via_ir=true
7-
solc = '0.8.17'
8-
evm-version = 'paris'
6+
solc = '0.8.28'
97
optimizer-runs = 200
108

119
[rpc_endpoints]

‎lib/devtools

Submodule devtools added at ac89128

‎lib/forge-std

Submodule forge-std updated 40 files

‎lib/layerzero-v2

Submodule layerzero-v2 added at 9a4049a

‎lib/openzeppelin-contracts

Submodule openzeppelin-contracts added at acd4ff7

‎lib/v4-core

Submodule v4-core added at e50237c

‎lib/v4-periphery

Submodule v4-periphery added at 9628c36

‎remappings.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
@ensdomains/=lib/shortcuts-contracts/node_modules/@ensdomains/
2+
@ensofinance/=lib/shortcuts-contracts/node_modules/@ensofinance/
3+
@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/
4+
@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/
5+
@layerzerolabs/lz-evm-oapp-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/oapp/
6+
@openzeppelin/=lib/shortcuts-contracts/node_modules/@openzeppelin/
7+
@rari-capital/=lib/shortcuts-contracts/node_modules/@rari-capital/
8+
@uniswap/v4-core/=lib/v4-core/
9+
@uniswap/v4-periphery/=lib/v4-periphery/
10+
clones-with-immutable-args/=lib/shortcuts-contracts/node_modules/clones-with-immutable-args/
11+
devtools/=lib/devtools/packages/toolbox-foundry/src/
12+
ds-test/=lib/forge-std/lib/ds-test/src/
13+
enso-weiroll/=lib/enso-weiroll/contracts/
14+
erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/
15+
eth-gas-reporter/=lib/shortcuts-contracts/node_modules/eth-gas-reporter/
16+
forge-std/=lib/forge-std/src/
17+
halmos-cheatcodes/=lib/openzeppelin-contracts/lib/halmos-cheatcodes/src/
18+
hardhat-deploy/=lib/shortcuts-contracts/node_modules/hardhat-deploy/
19+
hardhat/=lib/shortcuts-contracts/node_modules/hardhat/
20+
layerzero-v2/=lib/layerzero-v2/
21+
openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
22+
safe-contracts/=lib/safe-tools/lib/safe-contracts/contracts/
23+
safe-tools/=lib/safe-tools/src/
24+
shortcuts-contracts/=lib/shortcuts-contracts/contracts/
25+
solady/=lib/solady/src/
26+
solmate/=lib/solady/lib/solmate/src/

‎script/FullDeploy.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "../src/helpers/ERC20Helpers.sol";
88
import "../src/helpers/MathHelpers.sol";
99
import "../src/helpers/PercentageMathHelpers.sol";
1010
import "../src/helpers/SignedMathHelpers.sol";
11-
import "../src/helpers/SwapHelpers.sol";
11+
import {SwapHelpers} from "../src/helpers/SwapHelpers.sol";
1212
import "../src/helpers/TupleHelpers.sol";
1313

1414
struct DeployerResult {

‎script/RouterDeployer.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.17;
33

44
import "forge-std/Script.sol";
5-
import "../src/EnsoShortcutRouter.sol";
5+
import "../src/router/EnsoShortcutRouter.sol";
66

77
struct DeployerResult {
88
EnsoShortcutRouter router;

‎script/StargateDeployer.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.17;
33

44
import "forge-std/Script.sol";
5-
import "../src/StargateV2Receiver.sol";
5+
import "../src/bridge/StargateV2Receiver.sol";
66

77
contract StargateDeployer is Script {
88
function run() public returns (address stargateHelper) {

‎src/bridge/StargateV2Receiver.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.28;
33

44
import {ILayerZeroComposer} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroComposer.sol";
55
import {OFTComposeMsgCodec} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oft/libs/OFTComposeMsgCodec.sol";
6-
import {SafeERC20, IERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
6+
import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
77
import {VM} from "enso-weiroll/VM.sol";
88

99
contract StargateV2Receiver is VM, ILayerZeroComposer {

‎src/helpers/SommelierHelpers.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.20;
33

4-
import { SafeERC20, IERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
4+
import { SafeERC20, IERC20 } from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
55

66
interface IERC4626 {
77
function asset() external returns (address);

‎src/helpers/SwapHelpers.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.20;
33

4-
import { SafeERC20, IERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
4+
import { SafeERC20, IERC20 } from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
55

66
/**
77
* @notice Helper contract to update swap data on-chain

‎src/router/EnsoShortcutRouter.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.24;
33

44
import { EnsoShortcuts } from "./EnsoShortcuts.sol";
5-
import { SafeERC20, IERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
5+
import { SafeERC20, IERC20 } from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
66

77
struct Token {
88
IERC20 token;

‎src/router/EnsoShortcuts.sol

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
pragma solidity ^0.8.24;
33

44
import { VM } from "enso-weiroll/VM.sol";
5+
import { ERC721Holder } from "openzeppelin-contracts/token/ERC721/utils/ERC721Holder.sol";
6+
import { ERC1155Holder } from "openzeppelin-contracts/token/ERC1155/utils/ERC1155Holder.sol";
57

6-
contract EnsoShortcuts is VM {
8+
contract EnsoShortcuts is VM, ERC721Holder, ERC1155Holder {
79
address public executor;
810

911
error NotPermitted();
@@ -22,4 +24,6 @@ contract EnsoShortcuts is VM {
2224
if (msg.sender != executor) revert NotPermitted();
2325
return _execute(commands, state);
2426
}
25-
}
27+
28+
receive() external payable {}
29+
}

‎src/solvers/BaseSolver.sol

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
pragma solidity ^0.8.24;
33

44
import {VM} from "enso-weiroll/VM.sol";
5-
import {MinimalWallet} from "shortcuts-contracts/wallet/MinimalWallet.sol";
6-
import {AccessController} from "shortcuts-contracts/access/AccessController.sol";
5+
import {MinimalWallet} from "./MinimalWallet.sol";
76

8-
contract BaseSolver is VM, MinimalWallet, AccessController {
9-
address private immutable executor;
7+
contract BaseSolver is VM, MinimalWallet {
8+
address public immutable executor;
109

1110
// @dev Event emitted when a new request is made, uniquely identified by its `id`.
1211
// @param id A `bytes32` value that uniquely identifies a specific request.
@@ -15,8 +14,7 @@ contract BaseSolver is VM, MinimalWallet, AccessController {
1514
// @dev Constructor for the `BaseSolver` contract.
1615
// @param _owner The address of the owner who will be assigned the `OWNER_ROLE`. This parameter cannot be null.
1716
// @param _executor The address of the executor contract that interacts with this contract.
18-
constructor(address _owner, address _executor) {
19-
_setPermission(OWNER_ROLE, _owner, true);
17+
constructor(address _owner, address _executor) MinimalWallet(_owner) {
2018
if (_executor == address(0)) {
2119
revert NotPermitted();
2220
}
@@ -32,8 +30,6 @@ contract BaseSolver is VM, MinimalWallet, AccessController {
3230
bytes32[] calldata commands,
3331
bytes[] calldata state
3432
) public payable virtual returns (bytes[] memory response) {
35-
// we could use the AccessController here to check if the msg.sender is the executor address
36-
// but as it's a hot path we do a less gas intensive check
3733
if (msg.sender != executor) {
3834
revert NotPermitted();
3935
}

‎src/solvers/BebopSolver.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.24;
44
import {BaseSolver} from "./BaseSolver.sol";
55

66
contract BebopSolver is BaseSolver {
7-
address private immutable relayer;
7+
address public immutable relayer;
88

99
// @dev Constructor for the `BebopSolver` contract.
1010
// @param _owner The address of the owner who will be assigned the `OWNER_ROLE`. This parameter cannot be null.

0 commit comments

Comments
 (0)