Merge pull request #32 from 1inch/feature/native-token-drop

support native token drop
1inch · Sep 12, 2024 · 8cea66d · 8cea66d
2 parents 9027e5d + fd794f3
commit 8cea66d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/contracts/SignatureMerkleDrop128.sol b/contracts/SignatureMerkleDrop128.sol
@@ -33,7 +33,7 @@ contract SignatureMerkleDrop128 is ISignatureMerkleDrop128, Ownable {
         depth = depth_;
     }
 
-    function claim(address receiver, uint256 amount, bytes calldata merkleProof, bytes calldata signature) external override {
+    function claim(address receiver, uint256 amount, bytes calldata merkleProof, bytes calldata signature) external payable {
         bytes32 signedHash = ECDSA.toEthSignedMessageHash(keccak256(abi.encodePacked(receiver)));
         address account = ECDSA.recover(signedHash, signature);
         // Verify the merkle proof.
@@ -42,6 +42,7 @@ contract SignatureMerkleDrop128 is ISignatureMerkleDrop128, Ownable {
         if (!valid) revert InvalidProof();
         _invalidate(index);
         IERC20(token).safeTransfer(receiver, amount);
+        payable(receiver).sendValue(msg.value);
         _cashback();
     }
 
@@ -53,7 +54,7 @@ contract SignatureMerkleDrop128 is ISignatureMerkleDrop128, Ownable {
         return _verifyAsm(proof, merkleRoot, leaf);
     }
 
-    function isClaimed(uint256 index) external view override returns (bool) {
+    function isClaimed(uint256 index) external view returns (bool) {
         uint256 claimedWordIndex = index / 256;
         uint256 claimedBitIndex = index % 256;
         uint256 claimedWord = _claimedBitMap[claimedWordIndex];

diff --git a/contracts/interfaces/ISignatureMerkleDrop128.sol b/contracts/interfaces/ISignatureMerkleDrop128.sol
@@ -15,7 +15,7 @@ interface ISignatureMerkleDrop128 {
     // Returns the tree depth of the merkle tree containing account balances available to claim.
     function depth() external view returns (uint256);
     // Claim the given amount of the token to the given address. Reverts if the inputs are invalid.
-    function claim(address receiver, uint256 amount, bytes calldata merkleProof, bytes calldata signature) external;
+    function claim(address receiver, uint256 amount, bytes calldata merkleProof, bytes calldata signature) external payable;
     // Verifies that given leaf and merkle proof matches given merkle root and returns leaf index.
     function verify(bytes calldata proof, bytes16 root, bytes16 leaf) external view returns (bool valid, uint256 index);
     // Returns true if the index has been marked claimed.

diff --git a/test/SignatureMerkleDrop128.test.js b/test/SignatureMerkleDrop128.test.js
@@ -79,6 +79,12 @@ describe('SignatureMerkleDrop128', function () {
         await drop.claim(alice, 1, proofs[leaves.indexOf(hashedElements[0])], signature);
     });
 
+    it('Should transfer money to another wallet with extra value', async function () {
+        const { accounts: { alice }, contracts: { drop }, others: { hashedElements, leaves, proofs, signature } } = await loadFixture(deployContractsFixture);
+        const txn = await drop.claim(alice, 1, proofs[leaves.indexOf(hashedElements[0])], signature, { value: 10 });
+        expect(txn).to.changeEtherBalance(alice, 10);
+    });
+
     it('Should disallow invalid proof', async function () {
         const { accounts: { alice }, contracts: { drop }, others: { signature } } = await loadFixture(deployContractsFixture);
         await expect(