add update and disable endpoints (owner only)

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "evm/lib/forge-std"]
+    path = evm/lib/forge-std
+    url = https://github.com/foundry-rs/forge-std
+    branch = v1.8.0
+[submodule "evm/lib/openzeppelin-contracts"]
+    path = evm/lib/openzeppelin-contracts
+    url = https://github.com/openzeppelin/openzeppelin-contracts
+    branch = v4.9.6
+[submodule "evm/lib/wormhole-solidity-sdk"]
+    path = evm/lib/wormhole-solidity-sdk
+    url = https://github.com/wormhole-foundation/wormhole-solidity-sdk
+    branch = 2b7db51f99b49eda99b44f4a044e751cb0b2e8ea

evm/.gitignore

@@ -2,7 +2,6 @@
 .env
 .vscode
 cache
-/lib
 /bin
 node_modules
 out

evm/Makefile

@@ -14,28 +14,31 @@ integration-test: node_modules ts/tests/.env
 	bash ts/tests/run_integration_test.sh
 
 .PHONY: test
-test: node_modules ts/tests/.env
-	forge test --fork-url ${AVAX_RPC} -vv
+test: forge-test ts/tests/.env
 	bash ts/tests/run_integration_test.sh
 
+.PHONY: forge-test
+forge-test: dependencies
+	forge test --fork-url ${AVAX_RPC} -vv
+
 .PHONY: build
 build: dependencies
-	forge build
+	forge build --skip test
 	npm run build-types
 
 .PHONY: dependencies
-dependencies: node_modules lib/forge-std lib/openzeppelin-contracts
+dependencies: node_modules
 
 .PHONY: clean
 clean:
 	forge clean
-	rm -rf node_modules anvil.log lib forge-scripts ts/src/types
+	rm -rf node_modules anvil.log ts/src/types
 
 node_modules:
 	npm ci
 
-lib/forge-std:
-	forge install foundry-rs/forge-std@v1.6.1 --no-git --no-commit
+# lib/forge-std:
+# 	forge install foundry-rs/forge-std@v1.6.1 --no-git --no-commit
 
-lib/openzeppelin-contracts:
-	forge install openzeppelin/openzeppelin-contracts@v4.8.1 --no-git --no-commit
+# lib/openzeppelin-contracts:
+# 	forge install openzeppelin/openzeppelin-contracts@v4.8.1 --no-git --no-commit

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

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: Apache 2
 pragma solidity ^0.8.13;
 
-import "../wormhole/BytesLib.sol";
+import "local-modules/wormhole/BytesLib.sol";
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import {IMessageTransmitter} from "./IMessageTransmitter.sol";
+import {IMessageTransmitter} from "src/interfaces/external/IMessageTransmitter.sol";
 
 import "forge-std/Vm.sol";
 import "forge-std/console.sol";

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

@@ -2,10 +2,10 @@
 
 pragma solidity ^0.8.19;
 
-import {IWormhole} from "./IWormhole.sol";
-import {ICircleBridge} from "cctp-solidity/ICircleBridge.sol";
-import {IMessageTransmitter} from "cctp-solidity/IMessageTransmitter.sol";
-import {ITokenMinter} from "cctp-solidity/ITokenMinter.sol";
+import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
+import {ICircleBridge} from "src/interfaces/external/ICircleBridge.sol";
+import {IMessageTransmitter} from "src/interfaces/external/IMessageTransmitter.sol";
+import {ITokenMinter} from "src/interfaces/external/ITokenMinter.sol";
 
 interface ICircleIntegration {
 	struct TransferParameters {

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

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.17;
 
-import "./IWormhole.sol";
+import "wormhole-solidity-sdk/interfaces/IWormhole.sol";
 import "./BytesLib.sol";
 
 contract MockWormhole is IWormhole {

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

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache 2
 pragma solidity ^0.8.0;
 
-import {IWormhole} from "./IWormhole.sol";
+import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
 import {MockWormhole} from "./MockWormhole.sol";
 import "./BytesLib.sol";
 

evm/forge/scripts/DeployMatchingEngineContract.s.sol

@@ -6,12 +6,10 @@ import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
-import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
 
-import {MatchingEngineSetup} from "../../src/MatchingEngine/MatchingEngineSetup.sol";
+import {MatchingEngineSetup} from "src/MatchingEngine/MatchingEngineSetup.sol";
 import {MatchingEngineImplementation} from
-    "../../src/MatchingEngine/MatchingEngineImplementation.sol";
+    "src/MatchingEngine/MatchingEngineImplementation.sol";
 
 import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
 

evm/forge/scripts/DeployTokenRouterContracts.s.sol

@@ -6,15 +6,13 @@ import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
-import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
 
-import {TokenRouterSetup} from "../../src/TokenRouter/TokenRouterSetup.sol";
-import {TokenRouterImplementation} from "../../src/TokenRouter/TokenRouterImplementation.sol";
+import {TokenRouterSetup} from "src/TokenRouter/TokenRouterSetup.sol";
+import {TokenRouterImplementation} from "src/TokenRouter/TokenRouterImplementation.sol";
 
 import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
 
-import {Utils} from "../../src/shared/Utils.sol";
+import {Utils} from "src/shared/Utils.sol";
 
 contract DeployTokenRouterContracts is CheckWormholeContracts, Script {
     using Utils for address;

evm/forge/scripts/TestTransfer.s.sol

@@ -8,7 +8,7 @@ import "forge-std/console2.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "../../src/interfaces/ITokenRouter.sol";
+import "src/interfaces/ITokenRouter.sol";
 
 contract TestTransfer is Script {
     uint16 immutable _chainId = uint16(vm.envUint("RELEASE_CHAIN_ID"));

evm/forge/scripts/UpgradeMatchingEngine.s.sol

@@ -6,17 +6,15 @@ import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
-import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
-import {IMatchingEngine} from "../../src/interfaces/IMatchingEngine.sol";
+import {IMatchingEngine} from "src/interfaces/IMatchingEngine.sol";
 
-import {MatchingEngineSetup} from "../../src/MatchingEngine/MatchingEngineSetup.sol";
+import {MatchingEngineSetup} from "src/MatchingEngine/MatchingEngineSetup.sol";
 import {MatchingEngineImplementation} from
-    "../../src/MatchingEngine/MatchingEngineImplementation.sol";
+    "src/MatchingEngine/MatchingEngineImplementation.sol";
 
 import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
 
-import {Utils} from "../../src/shared/Utils.sol";
+import {Utils} from "src/shared/Utils.sol";
 
 contract UpgradeMatchingEngine is CheckWormholeContracts, Script {
     using Utils for bytes32;

evm/forge/scripts/UpgradeTokenRouter.s.sol

@@ -5,15 +5,12 @@ pragma solidity ^0.8.19;
 import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
-import {ICircleIntegration} from "wormhole-solidity/ICircleIntegration.sol";
-import {ITokenBridge} from "wormhole-solidity/ITokenBridge.sol";
-
-import {TokenRouterImplementation} from "../../src/TokenRouter/TokenRouterImplementation.sol";
-import {ITokenRouter} from "../../src/interfaces/ITokenRouter.sol";
+import {TokenRouterImplementation} from "src/TokenRouter/TokenRouterImplementation.sol";
+import {ITokenRouter} from "src/interfaces/ITokenRouter.sol";
 
 import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
 
-import {Utils} from "../../src/shared/Utils.sol";
+import {Utils} from "src/shared/Utils.sol";
 
 contract UpgradeTokenRouter is CheckWormholeContracts, Script {
     using Utils for address;

evm/forge/scripts/helpers/CheckWormholeContracts.sol

@@ -6,7 +6,7 @@ import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import { IWormhole } from "wormhole-solidity/IWormhole.sol";
+import { IWormhole } from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
 
 contract CheckWormholeContracts {
     function requireValidChain(uint16 chain, address wormhole) internal view {