Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improv: Comments #529

Merged
merged 2 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/Blast_SpokePool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "./Ovm_SpokePool.sol";
import "./external/interfaces/CCTPInterfaces.sol";

// USDB and WETH on Blast accrue yield that can be claimed by any account holding the token. So for the length of
// time that the SpokePool holds on to these assets, it can can claim interest.
// time that the SpokePool holds on to these assets, it can claim interest.
interface IERC20Rebasing {
enum YieldMode {
AUTOMATIC,
Expand Down
6 changes: 3 additions & 3 deletions contracts/chain-adapters/Blast_Adapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
// solhint-disable-next-line contract-name-camelcase
contract Blast_Adapter is CrossDomainEnabled, AdapterInterface, CircleCCTPAdapter {
using SafeERC20 for IERC20;
uint32 public immutable L2_GAS_LIMIT; // 200,000 is a reasonable default.

Check warning on line 50 in contracts/chain-adapters/Blast_Adapter.sol

View workflow job for this annotation

GitHub Actions / Solhint (16)

Variable name must be in mixedCase

WETH9Interface public immutable L1_WETH;

Check warning on line 52 in contracts/chain-adapters/Blast_Adapter.sol

View workflow job for this annotation

GitHub Actions / Solhint (16)

Variable name must be in mixedCase

IL1StandardBridge public immutable L1_STANDARD_BRIDGE; // 0x697402166Fbf2F22E970df8a6486Ef171dbfc524

Check warning on line 54 in contracts/chain-adapters/Blast_Adapter.sol

View workflow job for this annotation

GitHub Actions / Solhint (16)

Variable name must be in mixedCase

// Bridge used to get yielding version of ERC20's on L2.
IL1ERC20Bridge public immutable L1_BLAST_BRIDGE; // 0x3a05E5d33d7Ab3864D53aaEc93c8301C1Fa49115 on mainnet.

Check warning on line 57 in contracts/chain-adapters/Blast_Adapter.sol

View workflow job for this annotation

GitHub Actions / Solhint (16)

Variable name must be in mixedCase
address public immutable L1_DAI; // 0x6B175474E89094C44Da98b954EedeAC495271d0F on mainnet.

Check warning on line 58 in contracts/chain-adapters/Blast_Adapter.sol

View workflow job for this annotation

GitHub Actions / Solhint (16)

Variable name must be in mixedCase

/**
* @notice Constructs new Adapter.
Expand Down Expand Up @@ -83,8 +83,8 @@
}

/**
* @notice Send cross-chain message to target on Base.
* @param target Contract on Base that will receive message.
* @notice Send cross-chain message to target on Blast.
* @param target Contract on Blast that will receive message.
* @param message Data to send to target.
*/
function relayMessage(address target, bytes calldata message) external payable override {
Expand All @@ -108,7 +108,7 @@
// If token can be bridged into yield-ing version of ERC20 on L2 side, then use Blast Bridge, otherwise
// use standard bridge.

// If the l1Token is weth then unwrap it to ETH then send the ETH to the blast bridge.
// If the l1Token is weth then unwrap it to ETH then send the ETH to the standard bridge.
if (l1Token == address(L1_WETH)) {
L1_WETH.withdraw(amount);
// @dev: we can use the standard or the blast bridge to deposit ETH here:
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc7683/ERC7683.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct Input {
uint256 amount;
}

/// @notice Tokens that must be receive for a valid order fulfillment
/// @notice Tokens that must be received for a valid order fulfillment
struct Output {
/// @dev The address of the ERC20 token on the destination chain
/// @dev address(0) used as a sentinel for the native token
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc7683/ERC7683Depositor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ abstract contract ERC7683OrderDepositor is ISettlementContract {
// Permit2 contract for this network.
IPermit2 public immutable PERMIT2;

// quoteBeforeDeadline is subtracted from the deadline to get the quote timestamp.
// QUOTE_BEFORE_DEADLINE is subtracted from the deadline to get the quote timestamp.
// This is a somewhat arbitrary conversion, but order creators need some way to precompute the quote timestamp.
uint256 public immutable QUOTE_BEFORE_DEADLINE;

Expand Down
2 changes: 1 addition & 1 deletion contracts/handlers/MulticallHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ contract MulticallHandler is AcrossMessageHandler, ReentrancyGuard {
* @notice Main entrypoint for the handler called by the SpokePool contract.
* @dev This will execute all calls encoded in the msg. The caller is responsible for making sure all tokens are
* drained from this contract by the end of the series of calls. If not, they can be stolen.
* A drainRemainingTokens call can be included as a way to drain any remaining tokens from this contract.
* A drainLeftoverTokens call can be included as a way to drain any remaining tokens from this contract.
* @param message abi encoded array of Call structs, containing a target, callData, and value for each call that
* the contract should make.
*/
Expand Down
Loading