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

Merge headers #267

Merged
merged 1 commit into from
Jan 30, 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
6 changes: 1 addition & 5 deletions src/SablierV2MerkleStreamerLL.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@ contract SablierV2MerkleStreamerLL is
using SafeERC20 for IERC20;

/*//////////////////////////////////////////////////////////////////////////
USER-FACING CONSTANTS
STATE VARIABLES
//////////////////////////////////////////////////////////////////////////*/

/// @inheritdoc ISablierV2MerkleStreamerLL
ISablierV2LockupLinear public immutable override LOCKUP_LINEAR;

/*//////////////////////////////////////////////////////////////////////////
USER-FACING STORAGE
//////////////////////////////////////////////////////////////////////////*/

/// @inheritdoc ISablierV2MerkleStreamerLL
LockupLinear.Durations public override streamDurations;

Expand Down
14 changes: 3 additions & 11 deletions src/abstracts/SablierV2MerkleStreamer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ abstract contract SablierV2MerkleStreamer is
using SafeERC20 for IERC20;

/*//////////////////////////////////////////////////////////////////////////
USER-FACING CONSTANTS
STATE VARIABLES
//////////////////////////////////////////////////////////////////////////*/

/// @inheritdoc ISablierV2MerkleStreamer
Expand All @@ -36,19 +36,11 @@ abstract contract SablierV2MerkleStreamer is
/// @inheritdoc ISablierV2MerkleStreamer
bytes32 public immutable override MERKLE_ROOT;

/// @inheritdoc ISablierV2MerkleStreamer
bool public immutable override TRANSFERABLE;

/*//////////////////////////////////////////////////////////////////////////
INTERNAL CONSTANT
//////////////////////////////////////////////////////////////////////////*/

/// @dev The name of the campaign stored as bytes32.
bytes32 internal immutable NAME;

/*//////////////////////////////////////////////////////////////////////////
INTERNAL STORAGE
//////////////////////////////////////////////////////////////////////////*/
/// @inheritdoc ISablierV2MerkleStreamer
bool public immutable override TRANSFERABLE;

/// @dev Packed booleans that record the history of claims.
BitMaps.BitMap internal _claimedBitMap;
Expand Down
Loading