Skip to content

Commit 792dfbb

Browse files
a5-picklea5-pickle
committed
evm: add submodules
* remove IWormhole.sol and WormholeBytesParsing.sol * add wormhole-solidity-sdk * fix Makefile
1 parent a1956bb commit 792dfbb

27 files changed

+55
-1593
lines changed

‎.gitmodules

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[submodule "evm/lib/forge-std"]
2+
path = evm/lib/forge-std
3+
url = https://github.com/foundry-rs/forge-std
4+
branch = v1.8.0
5+
[submodule "evm/lib/openzeppelin-contracts"]
6+
path = evm/lib/openzeppelin-contracts
7+
url = https://github.com/openzeppelin/openzeppelin-contracts
8+
branch = v4.8.1
9+
[submodule "evm/lib/wormhole-solidity-sdk"]
10+
path = evm/lib/wormhole-solidity-sdk
11+
url = https://github.com/wormhole-foundation/wormhole-solidity-sdk
12+
branch = 2b7db51f99b49eda99b44f4a044e751cb0b2e8ea

‎evm/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.env
33
.vscode
44
cache
5-
/lib
65
/bin
76
node_modules
87
out

‎evm/Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ build: dependencies
2727
npm run build-types
2828

2929
.PHONY: dependencies
30-
dependencies: node_modules lib/forge-std lib/openzeppelin-contracts
30+
dependencies: node_modules
3131

3232
.PHONY: clean
3333
clean:
3434
forge clean
35-
rm -rf node_modules anvil.log lib forge-scripts ts/src/types
35+
rm -rf node_modules anvil.log ts/src/types
3636

3737
node_modules:
3838
npm ci
3939

40-
lib/forge-std:
41-
forge install foundry-rs/forge-std@v1.6.1 --no-git --no-commit
40+
# lib/forge-std:
41+
# forge install foundry-rs/forge-std@v1.6.1 --no-git --no-commit
4242

43-
lib/openzeppelin-contracts:
44-
forge install openzeppelin/openzeppelin-contracts@v4.8.1 --no-git --no-commit
43+
# lib/openzeppelin-contracts:
44+
# forge install openzeppelin/openzeppelin-contracts@v4.8.1 --no-git --no-commit

‎evm/forge/modules/wormhole/ICircleIntegration.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pragma solidity ^0.8.19;
44

5-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
5+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
66
import {ICircleBridge} from "src/interfaces/external/ICircleBridge.sol";
77
import {IMessageTransmitter} from "src/interfaces/external/IMessageTransmitter.sol";
88
import {ITokenMinter} from "src/interfaces/external/ITokenMinter.sol";

‎evm/forge/modules/wormhole/MockWormhole.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pragma solidity ^0.8.17;
44

5-
import "src/interfaces/external/IWormhole.sol";
5+
import "wormhole-solidity-sdk/interfaces/IWormhole.sol";
66
import "./BytesLib.sol";
77

88
contract MockWormhole is IWormhole {

‎evm/forge/modules/wormhole/WormholeSimulator.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache 2
22
pragma solidity ^0.8.0;
33

4-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
4+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
55
import {MockWormhole} from "./MockWormhole.sol";
66
import "./BytesLib.sol";
77

‎evm/forge/scripts/helpers/CheckWormholeContracts.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "forge-std/Script.sol";
66
import "forge-std/console2.sol";
77

88
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
9-
import { IWormhole } from "src/interfaces/external/IWormhole.sol";
9+
import { IWormhole } from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
1010

1111
contract CheckWormholeContracts {
1212
function requireValidChain(uint16 chain, address wormhole) internal view {

‎evm/forge/tests/MatchingEngine.t.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "forge-std/console.sol";
99
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1010
import {CircleSimulator} from "local-modules/circle/CircleSimulator.sol";
1111
import {IUSDC} from "local-modules/circle/IUSDC.sol";
12-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
12+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
1313
import {SigningWormholeSimulator} from "local-modules/wormhole/WormholeSimulator.sol";
1414
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
1515

@@ -1810,7 +1810,7 @@ contract MatchingEngineTest is Test {
18101810
address currentBidder,
18111811
address initialBidder,
18121812
bytes32 vmHash
1813-
) internal {
1813+
) internal view {
18141814
LiveAuctionData memory auction = engine.liveAuctionInfo(vmHash);
18151815
assertEq(uint8(auction.status), uint8(AuctionStatus.Active));
18161816
assertEq(auction.startBlock, uint88(block.number));
@@ -1826,7 +1826,7 @@ contract MatchingEngineTest is Test {
18261826
uint64 transferAmount,
18271827
IWormhole.VM memory cctpMessage,
18281828
address caller
1829-
) internal {
1829+
) internal view {
18301830
// Verify that the correct amount was sent in the CCTP order.
18311831
(
18321832
bytes32 token,

‎evm/forge/tests/TokenRouter.t.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import {CircleSimulator} from "local-modules/circle/CircleSimulator.sol";
1111
import {IUSDC} from "local-modules/circle/IUSDC.sol";
1212
import {ICircleIntegration} from "local-modules/wormhole/ICircleIntegration.sol";
1313
import {ITokenMessenger} from "src/interfaces/external/ITokenMessenger.sol";
14-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
14+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
1515
import {SigningWormholeSimulator} from "local-modules/wormhole/WormholeSimulator.sol";
1616
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
17-
import {BytesParsing} from "src/shared/WormholeBytesParsing.sol";
17+
import {BytesParsing} from "wormhole-solidity-sdk/libraries/BytesParsing.sol";
1818

1919
import {
2020
IMockTokenRouter,
@@ -664,7 +664,7 @@ contract TokenRouterTest is Test {
664664
bytes32 orderSender,
665665
bytes32 redeemer,
666666
bytes memory redeemerMessage
667-
) public {
667+
) public pure {
668668
Messages.Fill memory fill = Messages.Fill({
669669
sourceChain: sourceChain,
670670
orderSender: orderSender,
@@ -694,7 +694,7 @@ contract TokenRouterTest is Test {
694694
uint64 initAuctionFee,
695695
uint32 deadline,
696696
bytes memory redeemerMessage
697-
) public {
697+
) public pure {
698698
Messages.FastMarketOrder memory order = Messages.FastMarketOrder({
699699
amountIn: amountIn,
700700
minAmountOut: minAmountOut,
@@ -1324,7 +1324,7 @@ contract TokenRouterTest is Test {
13241324
usdc.mint(receiver, amount);
13251325
}
13261326

1327-
function _cctpBurnLimit() internal returns (uint256 limit) {
1327+
function _cctpBurnLimit() internal view returns (uint256 limit) {
13281328
limit = ITokenMessenger(CIRCLE_BRIDGE).localMinter().burnLimitsPerMessage(USDC_ADDRESS);
13291329

13301330
// Having this check prevents us forking a network where Circle has not set a burn limit.

‎evm/foundry.toml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
[fmt]
2-
line_length=100
2+
line_length = 100
33

44
[profile.default]
55
solc_version = "0.8.19"
66
optimizer = true
77
optimizer_runs = 200
88
via_ir = true
9-
extra_output = ["metadata", "storageLayout", "evm.deployedBytecode.immutableReferences"]
9+
extra_output = [
10+
"metadata",
11+
"storageLayout",
12+
"evm.deployedBytecode.immutableReferences",
13+
"evm.bytecode.opcodes"
14+
]
1015

1116
test = "forge/tests"
1217

@@ -24,4 +29,4 @@ remappings = [
2429

2530
gas_limit = "18446744073709551615"
2631

27-
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config
32+
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

‎evm/lib/forge-std

Submodule forge-std added at b6a506d

‎evm/lib/openzeppelin-contracts

Submodule openzeppelin-contracts added at 0457042

‎evm/lib/wormhole-solidity-sdk

Submodule wormhole-solidity-sdk added at 2b7db51

‎evm/src/MatchingEngine/MatchingEngineImplementation.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
44

55
import {ERC1967Upgrade} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Upgrade.sol";
66

7-
import {BytesParsing} from "src/shared/WormholeBytesParsing.sol";
7+
import {BytesParsing} from "wormhole-solidity-sdk/libraries/BytesParsing.sol";
88
import {Admin} from "src/shared/Admin.sol";
99
import {Messages} from "src/shared/Messages.sol";
1010
import {getImplementationState, Implementation} from "src/shared/Admin.sol";

‎evm/src/MatchingEngine/assets/MatchingEngineFastOrders.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ pragma solidity ^0.8.19;
55
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
66
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
77

8-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
8+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
99
import {CctpMessage, RouterEndpoint} from "src/interfaces/IMatchingEngineTypes.sol";
1010
import {IMatchingEngineFastOrders} from "src/interfaces/IMatchingEngineFastOrders.sol";
11-
import {BytesParsing} from "src/shared/WormholeBytesParsing.sol";
11+
import {BytesParsing} from "wormhole-solidity-sdk/libraries/BytesParsing.sol";
1212
import {Messages} from "src/shared/Messages.sol";
1313
import {Utils} from "src/shared/Utils.sol";
1414

‎evm/src/MatchingEngine/assets/State.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.19;
33

44
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
5-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
5+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
66
import {IMatchingEngineState} from "src/interfaces/IMatchingEngineState.sol";
77
import {RouterEndpoint} from "src/interfaces/IMatchingEngineTypes.sol";
88

‎evm/src/TokenRouter/TokenRouterImplementation.sol

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

55
import {ERC1967Upgrade} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Upgrade.sol";
6-
import {BytesParsing} from "src/shared/WormholeBytesParsing.sol";
6+
import {BytesParsing} from "wormhole-solidity-sdk/libraries/BytesParsing.sol";
77

88
import {Admin} from "src/shared/Admin.sol";
99
import {Messages} from "src/shared/Messages.sol";

‎evm/src/TokenRouter/assets/PlaceMarketOrder.sol

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

55
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
6-
import {BytesParsing} from "src/shared/WormholeBytesParsing.sol";
6+
import {BytesParsing} from "wormhole-solidity-sdk/libraries/BytesParsing.sol";
77

88
import {Admin} from "src/shared/Admin.sol";
99
import {Messages} from "src/shared/Messages.sol";

‎evm/src/TokenRouter/assets/RedeemFill.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
44

55
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
66
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
7-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
7+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
88

99
import {IMatchingEngine} from "src/interfaces/IMatchingEngine.sol";
1010

‎evm/src/TokenRouter/assets/State.sol

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

55
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
6-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
6+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
77
import {ITokenRouterState} from "src/interfaces/ITokenRouterState.sol";
88
import {FastTransferParameters, Endpoint} from "src/interfaces/ITokenRouterTypes.sol";
99

‎evm/src/interfaces/IMatchingEngineState.sol

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

55
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
6-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
6+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
77
import {ICircleIntegration} from "local-modules/wormhole/ICircleIntegration.sol";
88
import "./IMatchingEngineTypes.sol";
99

‎evm/src/interfaces/ITokenRouterState.sol

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

55
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
6-
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
6+
import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
77
import "./ITokenRouterTypes.sol";
88

99
interface ITokenRouterState {

0 commit comments

Comments
 (0)