diff --git a/packages/hardhat/contracts/claim/distributor-v5/ContinuousVestingMerkleDistributor.sol b/packages/hardhat/contracts/claim/distributor-v5/ContinuousVestingMerkleDistributor.sol index 72c85c6..1fd073f 100644 --- a/packages/hardhat/contracts/claim/distributor-v5/ContinuousVestingMerkleDistributor.sol +++ b/packages/hardhat/contracts/claim/distributor-v5/ContinuousVestingMerkleDistributor.sol @@ -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); _; } @@ -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()); diff --git a/packages/hardhat/contracts/claim/distributor-v5/TrancheVestingMerkleDistributor.sol b/packages/hardhat/contracts/claim/distributor-v5/TrancheVestingMerkleDistributor.sol index 62f312f..4e65766 100644 --- a/packages/hardhat/contracts/claim/distributor-v5/TrancheVestingMerkleDistributor.sol +++ b/packages/hardhat/contracts/claim/distributor-v5/TrancheVestingMerkleDistributor.sol @@ -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); _; } @@ -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()); diff --git a/packages/hardhat/contracts/sale/v4/FlatPriceSale.sol b/packages/hardhat/contracts/sale/v4/FlatPriceSale.sol index a4e7bdd..b9f92c5 100644 --- a/packages/hardhat/contracts/sale/v4/FlatPriceSale.sol +++ b/packages/hardhat/contracts/sale/v4/FlatPriceSale.sol @@ -248,6 +248,7 @@ contract FlatPriceSale_v_4_0 is Sale, PullPaymentUpgradeable, AccessVerifier { networkConfig.getAccessAuthorityAddress(), _msgSender(), userLimit, + hex"", expiresAt, signature ); diff --git a/packages/hardhat/contracts/utilities/AccessVerifier.sol b/packages/hardhat/contracts/utilities/AccessVerifier.sol index 32cc7a4..1f9a591 100644 --- a/packages/hardhat/contracts/utilities/AccessVerifier.sol +++ b/packages/hardhat/contracts/utilities/AccessVerifier.sol @@ -9,6 +9,7 @@ contract AccessVerifier { address accessAuthorityAddress, address member, uint256 userLimit, + bytes memory extraDetails, uint64 expires_at, bytes memory signature ) internal view { @@ -16,6 +17,7 @@ contract AccessVerifier { address(this), member, userLimit, + extraDetails, expires_at ); bytes32 hash = keccak256(message);