evm: fixes some imports

XLabs · Jan 22, 2025 · 4b719c4 · 4b719c4
1 parent 732aec3
commit 4b719c4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 36 deletions.
diff --git a/evm/lib/wormhole-solidity-sdk b/evm/lib/wormhole-solidity-sdk
diff --git a/evm/src/assets/TbrDispatcher.sol b/evm/src/assets/TbrDispatcher.sol
@@ -10,7 +10,7 @@ import { Upgrade } from "wormhole-sdk/components/dispatcher/Upgrade.sol";
 import { InvalidCommand } from "./TbrBase.sol";
 import { TbrConfig } from "./TbrConfig.sol";
 import { TbrUser } from "./TbrUser.sol";
-import "wormhole-sdk/components/dispatcher/ids.sol";
+import "wormhole-sdk/components/dispatcher/Ids.sol";
 import "./TbrIds.sol";
 
 /**

diff --git a/evm/src/assets/TbrUser.sol b/evm/src/assets/TbrUser.sol
@@ -8,8 +8,8 @@ import {PermitParsing} from "wormhole-sdk/libraries/PermitParsing.sol";
 import {fromUniversalAddress, reRevert} from "wormhole-sdk/Utils.sol";
 import {FREE_MEMORY_PTR} from "wormhole-sdk/constants/Common.sol";
 import {IWETH} from "wormhole-sdk/interfaces/token/IWETH.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "wormhole-sdk/interfaces/token/IERC20Metadata.sol";
+import {SafeERC20} from "wormhole-sdk/libraries/SafeERC20.sol";
 import {IERC20Permit} from "@openzeppelin/token/ERC20/extensions/IERC20Permit.sol";
 import {ISignatureTransfer, IAllowanceTransfer} from "permit2/IPermit2.sol";
 import {TRANSFER_TOKEN_WITH_RELAY_ID, TRANSFER_GAS_TOKEN_WITH_RELAY_ID, COMPLETE_TRANSFER_ID, RELAY_FEE_ID, BASE_RELAYING_CONFIG_ID, APPROVE_TOKEN_ID} from "./TbrIds.sol";

diff --git a/evm/test/DispatcherComponents.t.sol b/evm/test/DispatcherComponents.t.sol
@@ -7,7 +7,7 @@ import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
 import { IdempotentUpgrade } from "wormhole-sdk/proxy/ProxyBase.sol";
 import { UpgradeTester } from "./utils/UpgradeTester.sol";
 import { TbrTestBase } from "./utils/TbrTestBase.sol";
-import "wormhole-sdk/components/dispatcher/ids.sol";
+import "wormhole-sdk/components/dispatcher/Ids.sol";
 import "tbr/assets/TbrIds.sol";
 
 contract ConfigTest is TbrTestBase {

diff --git a/evm/test/User.t.sol b/evm/test/User.t.sol
@@ -2,22 +2,21 @@
 
 pragma solidity ^0.8.25;
 
-import { makeBytes32, ERC20Mock, discardInsignificantBits, deNormalizeAmount } from "./utils/utils.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { ISignatureTransfer, IAllowanceTransfer } from "permit2/IPermit2.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "tbr/assets/TbrDispatcher.sol";
+import "tbr/assets/TbrUser.sol";
+import "tbr/assets/TbrIds.sol";
 import { ITokenBridge } from "wormhole-sdk/interfaces/ITokenBridge.sol";
-import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
+import { IERC20 } from "wormhole-sdk/interfaces/token/IERC20.sol";
 import { IWETH } from "wormhole-sdk/interfaces/token/IWETH.sol";
+import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
+import { SafeERC20 } from "wormhole-sdk/libraries/SafeERC20.sol";
 import { IPriceOracle } from "price-oracle/IPriceOracle.sol";
 import { toUniversalAddress } from "wormhole-sdk/Utils.sol";
 import { CHAIN_ID_ETHEREUM } from "wormhole-sdk/constants/Chains.sol";
-import { TbrTestBase } from "./utils/TbrTestBase.sol";
-import { craftTbrV3Vaa } from "./utils/utils.sol";
 
-import "tbr/assets/TbrDispatcher.sol";
-import "tbr/assets/TbrUser.sol";
-import "tbr/assets/TbrIds.sol";
+import { TbrTestBase } from "./utils/TbrTestBase.sol";
+import { craftTbrV3Vaa, deNormalizeAmount, discardInsignificantBits, ERC20Mock, makeBytes32 } from "./utils/utils.sol";
 
 contract UserTest is TbrTestBase {
   using BytesParsing for bytes;
@@ -100,7 +99,7 @@ contract UserTest is TbrTestBase {
     unallocatedBalance = bound(unallocatedBalance, feeQuote + wormholeFee, (feeQuote + wormholeFee) * 10);
     deal(address(this), unallocatedBalance);
     deal(address(usdt), address(this), tokenAmount);
-    SafeERC20.safeApprove(usdt, address(tbr), tokenAmount);
+    SafeERC20.forceApprove(usdt, address(tbr), tokenAmount);
 
     uint16 targetChain = SOLANA_CHAIN_ID;
     bool unwrapIntent = false;
@@ -201,7 +200,7 @@ contract UserTest is TbrTestBase {
     unallocatedBalance = bound(unallocatedBalance, feeQuote + wormholeFee, (feeQuote + wormholeFee) * 10);
     deal(address(this), unallocatedBalance);
     deal(address(usdt), address(this), tokenAmount);
-    SafeERC20.safeApprove(usdt, address(tbr), tokenAmount);
+    SafeERC20.forceApprove(usdt, address(tbr), tokenAmount);
 
     uint16 targetChain = SOLANA_CHAIN_ID;
     bool unwrapIntent = false;
@@ -292,7 +291,7 @@ contract UserTest is TbrTestBase {
 
     ERC20Mock token = new ERC20Mock("test token", "TST", decimals);
     deal(address(token), address(this), firstTokenAmount + secondTokenAmount);
-    SafeERC20.safeApprove(IERC20Metadata(address(token)), address(tbr), firstTokenAmount + secondTokenAmount);
+    SafeERC20.forceApprove(IERC20Metadata(address(token)), address(tbr), firstTokenAmount + secondTokenAmount);
 
     uint16 targetChain = SOLANA_CHAIN_ID;
     bool unwrapIntent = false;
@@ -410,7 +409,7 @@ contract UserTest is TbrTestBase {
     unallocatedBalance = bound(unallocatedBalance, 0, feeQuote + wormholeFee - 1);
     deal(address(this), unallocatedBalance);
     deal(address(usdt), address(this), tokenAmount);
-    SafeERC20.safeApprove(usdt, address(tbr), tokenAmount);
+    SafeERC20.forceApprove(usdt, address(tbr), tokenAmount);
 
     uint16 targetChain = SOLANA_CHAIN_ID;
     bool unwrapIntent = false;
@@ -684,7 +683,7 @@ contract UserTest is TbrTestBase {
     bytes memory data = abi.encodePacked(ACQUIRE_PREAPPROVED);
 
     deal(address(usdt), address(this), tokenAmount);
-    SafeERC20.safeApprove(usdt, address(tbrExposer), tokenAmount);
+    SafeERC20.forceApprove(usdt, address(tbrExposer), tokenAmount);
 
     vm.mockCall(
       address(usdt),
@@ -1295,7 +1294,6 @@ contract UserTest is TbrTestBase {
     uint initialRecipientGasTokenBalance = recipient.balance;
     uint initialCallerBalance = address(this).balance;
 
-    uint64 sequence = 0;
     vm.expectEmit(address(tokenBridge));
     emit ITokenBridge.TransferRedeemed(peerChain, originTokenBridge, sequence);
 
@@ -1369,7 +1367,6 @@ contract UserTest is TbrTestBase {
     uint initialCallerBalance = address(this).balance;
     uint initialRecipientTransferredTokenBalance = IERC20(tokenToTransfer).balanceOf(recipient);
 
-    uint64 sequence = 0;
     vm.expectEmit(address(tokenBridge));
     emit ITokenBridge.TransferRedeemed(peerChain, originTokenBridge, sequence);
 

diff --git a/evm/test/utils/TbrExposer.sol b/evm/test/utils/TbrExposer.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.25;
 
-import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import { IERC20Metadata } from "wormhole-sdk/interfaces/token/IERC20Metadata.sol";
 import { ITokenBridge } from "wormhole-sdk/interfaces/ITokenBridge.sol";
 import { IWETH } from "wormhole-sdk/interfaces/token/IWETH.sol";
 import { IPermit2 } from "permit2/IPermit2.sol";

diff --git a/evm/test/utils/TbrTestBase.sol b/evm/test/utils/TbrTestBase.sol
@@ -2,29 +2,30 @@
 
 pragma solidity ^0.8.25;
 
-import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import "forge-std/Test.sol";
 import { SolanaFeeParams } from "price-oracle/assets/types/SolanaFeeParams.sol";
-import { WormholeOverride } from "wormhole-sdk/testing/WormholeOverride.sol";
 import { EvmFeeParams } from "price-oracle/assets/types/EvmFeeParams.sol";
-import { ITokenBridge } from "wormhole-sdk/interfaces/ITokenBridge.sol";
-import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
-import { IWormhole } from "wormhole-sdk/interfaces/IWormhole.sol";
-import { IWETH } from "wormhole-sdk/interfaces/token/IWETH.sol";
-import { IPriceOracle } from "price-oracle/IPriceOracle.sol";
-import { PriceOracle } from "price-oracle/PriceOracle.sol";
-import { Proxy } from "wormhole-sdk/proxy/Proxy.sol";
-import { reRevert } from "wormhole-sdk/Utils.sol";
-import { IPermit2 } from "permit2/IPermit2.sol";
-import { TbrExposer } from "./TbrExposer.sol";
-import { Tbr } from "tbr/Tbr.sol";
-import "forge-std/Test.sol";
 import {
   PricePerByte,
   GasPrice,
   GasTokenPrice,
   AccountOverhead,
   AccountSizeCost
 } from "price-oracle/assets/types/ParamLibs.sol";
+import { IPriceOracle } from "price-oracle/IPriceOracle.sol";
+import { PriceOracle } from "price-oracle/PriceOracle.sol";
+import { IPermit2 } from "permit2/IPermit2.sol";
+import { Tbr } from "tbr/Tbr.sol";
+import { ITokenBridge } from "wormhole-sdk/interfaces/ITokenBridge.sol";
+import { IWormhole } from "wormhole-sdk/interfaces/IWormhole.sol";
+import { IERC20Metadata } from "wormhole-sdk/interfaces/token/IERC20Metadata.sol";
+import { IWETH } from "wormhole-sdk/interfaces/token/IWETH.sol";
+import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
+import { Proxy } from "wormhole-sdk/proxy/Proxy.sol";
+import { WormholeOverride } from "wormhole-sdk/testing/WormholeOverride.sol";
+import { reRevert } from "wormhole-sdk/Utils.sol";
+
+import { TbrExposer } from "./TbrExposer.sol";
 
 contract TbrTestBase is Test {
   using BytesParsing for bytes;
+12 −0		src/interfaces/token/IERC20Metadata.sol
+1 −0		test/components/dispatcher/AccessControl.t.sol