Skip to content

Commit 44252c7

Browse files
a5-picklea5-pickle
committed
evm: several things
* add update router and disable router for engine and router * clean up imports * reorganize modules
1 parent 0fe869d commit 44252c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2050
-1802
lines changed

‎evm/Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ integration-test: node_modules ts/tests/.env
1414
bash ts/tests/run_integration_test.sh
1515

1616
.PHONY: test
17-
test: node_modules ts/tests/.env
18-
forge test --fork-url ${AVAX_RPC} -vv
17+
test: forge-test ts/tests/.env
1918
bash ts/tests/run_integration_test.sh
2019

20+
.PHONY: forge-test
21+
forge-test: dependencies
22+
forge test --fork-url ${AVAX_RPC} -vv
23+
2124
.PHONY: build
2225
build: dependencies
23-
forge build
26+
forge build --skip test
2427
npm run build-types
2528

2629
.PHONY: dependencies

‎evm/modules/circle/CircleSimulator.sol ‎evm/forge/modules/circle/CircleSimulator.sol

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

4-
import "../wormhole/BytesLib.sol";
4+
import "local-modules/wormhole/BytesLib.sol";
55

66
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
77
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
88

9-
import {IMessageTransmitter} from "./IMessageTransmitter.sol";
9+
import {IMessageTransmitter} from "src/interfaces/external/IMessageTransmitter.sol";
1010

1111
import "forge-std/Vm.sol";
1212
import "forge-std/console.sol";

‎evm/modules/circle/IUSDC.sol ‎evm/forge/modules/circle/IUSDC.sol

File renamed without changes.

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

File renamed without changes.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
pragma solidity ^0.8.19;
44

5-
import {IWormhole} from "./IWormhole.sol";
6-
import {ICircleBridge} from "cctp-solidity/ICircleBridge.sol";
7-
import {IMessageTransmitter} from "cctp-solidity/IMessageTransmitter.sol";
8-
import {ITokenMinter} from "cctp-solidity/ITokenMinter.sol";
5+
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
6+
import {ICircleBridge} from "src/interfaces/external/ICircleBridge.sol";
7+
import {IMessageTransmitter} from "src/interfaces/external/IMessageTransmitter.sol";
8+
import {ITokenMinter} from "src/interfaces/external/ITokenMinter.sol";
99

1010
interface ICircleIntegration {
1111
struct TransferParameters {

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

File renamed without changes.

‎evm/modules/wormhole/MockWormhole.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 "./IWormhole.sol";
5+
import "src/interfaces/external/IWormhole.sol";
66
import "./BytesLib.sol";
77

88
contract MockWormhole is IWormhole {

‎evm/modules/wormhole/WormholeSimulator.sol ‎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 "./IWormhole.sol";
4+
import {IWormhole} from "src/interfaces/external/IWormhole.sol";
55
import {MockWormhole} from "./MockWormhole.sol";
66
import "./BytesLib.sol";
77

‎evm/forge/scripts/DeployMatchingEngineContract.s.sol

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ import "forge-std/Script.sol";
66
import "forge-std/console2.sol";
77

88
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
9-
import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
10-
import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
119

12-
import {MatchingEngineSetup} from "../../src/MatchingEngine/MatchingEngineSetup.sol";
10+
import {MatchingEngineSetup} from "src/MatchingEngine/MatchingEngineSetup.sol";
1311
import {MatchingEngineImplementation} from
14-
"../../src/MatchingEngine/MatchingEngineImplementation.sol";
12+
"src/MatchingEngine/MatchingEngineImplementation.sol";
1513

1614
import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
1715

‎evm/forge/scripts/DeployTokenRouterContracts.s.sol

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ import "forge-std/Script.sol";
66
import "forge-std/console2.sol";
77

88
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
9-
import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
10-
import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
119

12-
import {TokenRouterSetup} from "../../src/TokenRouter/TokenRouterSetup.sol";
13-
import {TokenRouterImplementation} from "../../src/TokenRouter/TokenRouterImplementation.sol";
10+
import {TokenRouterSetup} from "src/TokenRouter/TokenRouterSetup.sol";
11+
import {TokenRouterImplementation} from "src/TokenRouter/TokenRouterImplementation.sol";
1412

1513
import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
1614

17-
import {Utils} from "../../src/shared/Utils.sol";
15+
import {Utils} from "src/shared/Utils.sol";
1816

1917
contract DeployTokenRouterContracts is CheckWormholeContracts, Script {
2018
using Utils for address;

‎evm/forge/scripts/TestTransfer.s.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "forge-std/console2.sol";
88
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
99
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
1010

11-
import "../../src/interfaces/ITokenRouter.sol";
11+
import "src/interfaces/ITokenRouter.sol";
1212

1313
contract TestTransfer is Script {
1414
uint16 immutable _chainId = uint16(vm.envUint("RELEASE_CHAIN_ID"));

‎evm/forge/scripts/UpgradeMatchingEngine.s.sol

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

88
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
9-
import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
10-
import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
11-
import {IMatchingEngine} from "../../src/interfaces/IMatchingEngine.sol";
9+
import {IMatchingEngine} from "src/interfaces/IMatchingEngine.sol";
1210

13-
import {MatchingEngineSetup} from "../../src/MatchingEngine/MatchingEngineSetup.sol";
11+
import {MatchingEngineSetup} from "src/MatchingEngine/MatchingEngineSetup.sol";
1412
import {MatchingEngineImplementation} from
15-
"../../src/MatchingEngine/MatchingEngineImplementation.sol";
13+
"src/MatchingEngine/MatchingEngineImplementation.sol";
1614

1715
import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
1816

19-
import {Utils} from "../../src/shared/Utils.sol";
17+
import {Utils} from "src/shared/Utils.sol";
2018

2119
contract UpgradeMatchingEngine is CheckWormholeContracts, Script {
2220
using Utils for bytes32;

‎evm/forge/scripts/UpgradeTokenRouter.s.sol

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ pragma solidity ^0.8.19;
55
import "forge-std/Script.sol";
66
import "forge-std/console2.sol";
77

8-
import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
9-
import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
10-
11-
import {TokenRouterImplementation} from "../../src/TokenRouter/TokenRouterImplementation.sol";
12-
import {ITokenRouter} from "../../src/interfaces/ITokenRouter.sol";
8+
import {TokenRouterImplementation} from "src/TokenRouter/TokenRouterImplementation.sol";
9+
import {ITokenRouter} from "src/interfaces/ITokenRouter.sol";
1310

1411
import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
1512

16-
import {Utils} from "../../src/shared/Utils.sol";
13+
import {Utils} from "src/shared/Utils.sol";
1714

1815
contract UpgradeTokenRouter is CheckWormholeContracts, Script {
1916
using Utils for address;

‎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 "wormhole-solidity/IWormhole.sol";
9+
import { IWormhole } from "src/interfaces/external/IWormhole.sol";
1010

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

0 commit comments

Comments
 (0)