evm: fix wormhole-solidity-sdk commit

evm: fix imports
wormholelabs-xyz · Oct 2, 2024 · 1bc0f38 · 1bc0f38
1 parent 30f67d8
commit 1bc0f38
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/evm/Makefile b/evm/Makefile
@@ -32,7 +32,7 @@ test: dependencies
 LIB_DEPS = foundry-rs/forge-std
 LIB_DEPS += openzeppelin/openzeppelin-contracts@dc44c9f #4.9.6
 LIB_DEPS += Uniswap/permit2@cc56ad0 #latest commit as per 22/04/2024
-LIB_DEPS += wormhole-foundation/wormhole-solidity-sdk@b935ddc #post-merged branch
+LIB_DEPS += wormhole-foundation/wormhole-solidity-sdk@60fb760 #post-merged branch
 LIB_DEPS += wormhole-foundation/example-liquidity-layer@f57444f #main branch
 
 # dynamically generate install rule for each lib dependency and add to depdenencies

diff --git a/evm/foundry.toml b/evm/foundry.toml
@@ -13,6 +13,7 @@ remappings = [
     "@openzeppelin/=lib/openzeppelin-contracts/contracts/",
     "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/",
     "forge-std/=lib/forge-std/src/",
+    "permit2/=lib/permit2/src/",
     "wormhole-sdk/=lib/wormhole-solidity-sdk/src/",
     "liquidity-layer/=lib/example-liquidity-layer/evm/src/",
     "local-modules/=lib/example-liquidity-layer/evm/forge/modules/",

diff --git a/evm/src/assets/SwapLayerBase.sol b/evm/src/assets/SwapLayerBase.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/token/ERC20/IERC20.sol";
 import "@openzeppelin/token/ERC20/utils/SafeERC20.sol";
 
 import "wormhole-sdk/interfaces/IWormhole.sol";
-import "wormhole-sdk/interfaces/token/IPermit2.sol";
+import "permit2/interfaces/IPermit2.sol";
 
 import {IWETH} from "wormhole-sdk/interfaces/token/IWETH.sol";
 import "wormhole-sdk/libraries/BytesParsing.sol";

diff --git a/evm/src/assets/SwapLayerInitiate.sol b/evm/src/assets/SwapLayerInitiate.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/token/ERC20/IERC20.sol";
 import "@openzeppelin/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/token/ERC20/extensions/IERC20Permit.sol";
 
-import "wormhole-sdk/interfaces/token/IPermit2.sol";
+import "permit2/interfaces/IPermit2.sol";
 import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
 
 import { checkAddr } from "./Params.sol";

diff --git a/evm/test/SLTBase.sol b/evm/test/SLTBase.sol
@@ -8,10 +8,9 @@ import { ERC1967Proxy } from "@openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
 import "@openzeppelin/token/ERC20/IERC20.sol";
 
 import "wormhole-sdk/interfaces/IWormhole.sol";
-import "wormhole-sdk/interfaces/token/IWETH.sol";
-import "wormhole-sdk/interfaces/token/IUSDC.sol";
+import { IWETH } from "wormhole-sdk/interfaces/token/IWETH.sol";
 import "wormhole-sdk/proxy/Proxy.sol";
-import "wormhole-sdk/testing/UsdcDealer.sol";
+import { IUSDC, UsdcDealer } from "wormhole-sdk/testing/UsdcDealer.sol";
 import "wormhole-sdk/testing/WormholeCctpSimulator.sol";
 
 import { ITokenRouter } from "liquidity-layer/interfaces/ITokenRouter.sol";