Skip to content

feat(DEV-1089): ensure vesting schedule params are signed by API #58

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.

Sign up for GitHub

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

Open
L8D wants to merge 1 commit into
base: DEV-339/Update-distributor-contracts-user-specific-tranche-time-offset_Tenor-Biel
Choose a base branch
from
Open

feat(DEV-1089): ensure vesting schedule params are signed by API #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions packages/hardhat/contracts/claim/distributor-v5/ContinuousVestingMerkleDistributor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ contract ContinuousVestingMerkleDistributor_v_5_0 is Initializable, ContinuousVe
return 5;
}

modifier validSignature(uint256 totalAmount, uint64 expiresAt, bytes memory signature) {
verifyAccessSignature(networkConfig.getAccessAuthorityAddress(), _msgSender(), totalAmount, expiresAt, signature);
modifier validSignature(uint256 totalAmount, bytes memory extraDetails, uint64 expiresAt, bytes memory signature) {
verifyAccessSignature(networkConfig.getAccessAuthorityAddress(), _msgSender(), totalAmount, extraDetails, expiresAt, signature);

_;
}
Expand All @@ -94,7 +94,7 @@ contract ContinuousVestingMerkleDistributor_v_5_0 is Initializable, ContinuousVe
)
external
payable
validSignature(totalAmount, expiresAt, signature)
validSignature(totalAmount, encodedVestingSchedule, expiresAt, signature)
nonReentrant
{
IOracleOrL2OracleWithSequencerCheck nativeTokenPriceOracle = IOracleOrL2OracleWithSequencerCheck(networkConfig.getNativeTokenPriceOracleAddress());
Expand Down
6 changes: 3 additions & 3 deletions packages/hardhat/contracts/claim/distributor-v5/TrancheVestingMerkleDistributor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ contract TrancheVestingMerkleDistributor_v_5_0 is
return 5;
}

modifier validSignature(uint256 totalAmount, uint64 expiresAt, bytes memory signature) {
verifyAccessSignature(networkConfig.getAccessAuthorityAddress(), _msgSender(), totalAmount, expiresAt, signature);
modifier validSignature(uint256 totalAmount, bytes memory extraDetails, uint64 expiresAt, bytes memory signature) {
verifyAccessSignature(networkConfig.getAccessAuthorityAddress(), _msgSender(), totalAmount, extraDetails, expiresAt, signature);

_;
}
Expand All @@ -95,7 +95,7 @@ contract TrancheVestingMerkleDistributor_v_5_0 is
)
external
payable
validSignature(totalAmount, expiresAt, signature)
validSignature(totalAmount, encodedVestingSchedule, expiresAt, signature)
nonReentrant
{
IOracleOrL2OracleWithSequencerCheck nativeTokenPriceOracle = IOracleOrL2OracleWithSequencerCheck(networkConfig.getNativeTokenPriceOracleAddress());
Expand Down
1 change: 1 addition & 0 deletions packages/hardhat/contracts/sale/v4/FlatPriceSale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ contract FlatPriceSale_v_4_0 is Sale, PullPaymentUpgradeable, AccessVerifier {
networkConfig.getAccessAuthorityAddress(),
_msgSender(),
userLimit,
hex"",
expiresAt,
signature
);
Expand Down
2 changes: 2 additions & 0 deletions packages/hardhat/contracts/utilities/AccessVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ contract AccessVerifier {
address accessAuthorityAddress,
address member,
uint256 userLimit,
bytes memory extraDetails,
uint64 expires_at,
bytes memory signature
) internal view {
bytes memory message = abi.encodePacked(
address(this),
member,
userLimit,
extraDetails,
expires_at
);
bytes32 hash = keccak256(message);
Expand Down