Merge pull request #115 from XLabs/update-sdk

Bump wormhole sdk version

.gitmodules

@@ -1,18 +1,12 @@
 [submodule "evm/lib/forge-std"]
 	path = evm/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "evm/lib/openzeppelin-contracts"]
-	path = evm/lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
-[submodule "evm/lib/relayer-infra-contracts"]
-	path = lib/relayer-infra-contracts
-	url = https://github.com/XLabs/relayer-infra-contracts
 [submodule "evm/lib/permit2"]
 	path = evm/lib/permit2
 	url = https://github.com/Uniswap/permit2
-[submodule "evm/lib/wormhole-solidity-sdk"]
-	path = evm/lib/wormhole-solidity-sdk
-	url = https://github.com/wormhole-foundation/wormhole-solidity-sdk
 [submodule "wormhole-foundation-solidity-sdk"]
 	path = evm/lib/wormhole-solidity-sdk
 	url = https://github.com/wormhole-foundation/wormhole-solidity-sdk
+[submodule "lib/relayer-infra-contracts"]
+	path = lib/relayer-infra-contracts
+	url = https://github.com/XLabs/relayer-infra-contracts

evm/src/Tbr.sol

@@ -41,7 +41,7 @@ contract Tbr is TbrDispatcher {
       (admins[i],  offset) = args.asAddressCdUnchecked(offset);
     }
 
-    args.checkLengthCd(offset);
+    BytesParsing.checkLength(offset, args.length);
 
     _accessControlConstruction(owner, admins);
     _configConstruction(payable(feeRecipient));

evm/src/assets/TbrBase.sol

@@ -203,11 +203,4 @@ abstract contract TbrBase is PriceOracleIntegration {
     }
     state.paused = paused;
   }
-
-  function _transferEth(address to, uint256 amount) internal {
-    if (amount == 0) return;
-
-    (bool success, ) = to.call{value: amount}(new bytes(0));
-    if (!success) revert PaymentFailure(to);
-  }
 }

evm/src/assets/TbrConfig.sol

@@ -8,8 +8,8 @@ import {
   accessControlState, 
   Role,
   NotAuthorized,
-  senderHasAuth
-} from "./sharedComponents/AccessControl.sol";
+  senderAtLeastAdmin
+} from "wormhole-sdk/components/dispatcher/AccessControl.sol";
 import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
 import { ProxyBase } from "wormhole-sdk/proxy/ProxyBase.sol";
 import { TbrBase } from "./TbrBase.sol";
@@ -50,7 +50,7 @@ abstract contract TbrConfig is TbrBase, AccessControl {
   // ---- externals ----
 
   function _batchConfigCommands(bytes calldata commands, uint offset) internal returns (uint) {
-    bool isOwner = senderHasAuth() == Role.Owner;
+    bool isOwner = senderAtLeastAdmin() == Role.Owner;
 
     uint commandCount;
     (commandCount, offset) = commands.asUint8CdUnchecked(offset);
@@ -168,7 +168,7 @@ abstract contract TbrConfig is TbrBase, AccessControl {
   // ---- private ----
 
   function _setFeeRecipient(address newFeeRecipient) internal {
-    senderHasAuth();
+    senderAtLeastAdmin();
 
     ConfigState storage state = configState();
     address oldFeeRecipient = state.feeRecipient;

evm/src/assets/TbrDispatcher.sol

@@ -3,13 +3,14 @@
 pragma solidity ^0.8.25;
 
 import { BytesParsing } from "wormhole-sdk/libraries/BytesParsing.sol";
-import { SweepTokens } from "./sharedComponents/SweepTokens.sol";
+import { SweepTokens } from "wormhole-sdk/components/dispatcher/SweepTokens.sol";
+import { tokenOrNativeTransfer } from "wormhole-sdk/utils/Transfer.sol";
 import { RawDispatcher } from "wormhole-sdk/RawDispatcher.sol";
-import { Upgrade } from "./sharedComponents/Upgrade.sol";
+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 "./sharedComponents/ids.sol";
+import "wormhole-sdk/components/dispatcher/Ids.sol";
 import "./TbrIds.sol";
 
 /**
@@ -71,10 +72,10 @@ abstract contract TbrDispatcher is RawDispatcher, TbrConfig, TbrUser, SweepToken
       ++commandIndex;
     }
 
-    data.checkLengthCd(offset);
+    BytesParsing.checkLength(offset, data.length);
 
-    _transferEth(_getFeeRecipient(), fees);
-    _transferEth(msg.sender, senderRefund);
+    tokenOrNativeTransfer(address(0), _getFeeRecipient(), fees);
+    tokenOrNativeTransfer(address(0), msg.sender, senderRefund);
     return new bytes(0);
   }}
 
@@ -113,7 +114,7 @@ abstract contract TbrDispatcher is RawDispatcher, TbrConfig, TbrUser, SweepToken
       ret = abi.encodePacked(ret, result);
       ++queryIndex;
     }
-    data.checkLengthCd(offset);
+    BytesParsing.checkLength(offset, data.length);
     return ret;
   }}
 }

evm/src/assets/TbrUser.sol

@@ -8,9 +8,9 @@ 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 {IERC20Permit} from "@openzeppelin/token/ERC20/extensions/IERC20Permit.sol";
+import {IERC20Metadata} from "wormhole-sdk/interfaces/token/IERC20Metadata.sol";
+import {IERC20Permit} from "wormhole-sdk/interfaces/token/IERC20Permit.sol";
+import {SafeERC20} from "wormhole-sdk/libraries/SafeERC20.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";
 import {TbrBase, InvalidCommand} from "./TbrBase.sol";