added claimAll

packages/hardhat/contracts/Quest.sol

@@ -50,19 +50,21 @@ contract Quest {
     function claim(
         bytes memory _evidence,
         address _player,
-        uint256 _amount
+        uint256 _amount,
+        bool _claimAll
     ) external {
         require(msg.sender == aragonGovernAddress, "ERROR: Sender not govern");
         require(_evidence.length != 0, "ERROR: No evidence");
-
-        if (_amount > 0) {
-            rewardToken.safeTransfer(_player, _amount);
-        } else if (_amount == 0) {
+        if (_claimAll) {
             rewardToken.safeTransfer(
                 _player,
                 rewardToken.balanceOf(address(this))
             );
         }
+        //This way the user won't need to trigger a useless safeTransfer call
+        else if (_amount > 0) {
+            rewardToken.safeTransfer(_player, _amount);
+        }
 
         claims.push(Claim(_evidence, _player, _amount));
 

packages/hardhat/test/Quest.test.ts

@@ -93,7 +93,8 @@ describe("[Contract] Quest", function () {
         await quest.claim(
           hashToBytes("evidence1"),
           player.address,
-          claimAmount
+          claimAmount,
+          false
         );
 
         // Assert
@@ -103,9 +104,10 @@ describe("[Contract] Quest", function () {
         );
       });
 
-      it("should transfer rest of available funds to player when claimAmount is 0", async function () {
+      it("should transfer rest of available funds to player when claimAll is true", async function () {
         // Arrange
-        const claimAmount = 0; // Claim all remaining
+        const claimAmount = 500; // Claim all remaining
+        const claimAll = true;
         const quest = await deployQuest(
           "fakeTitle",
           "0x",
@@ -120,7 +122,8 @@ describe("[Contract] Quest", function () {
         await quest.claim(
           hashToBytes("evidence1"),
           player.address,
-          claimAmount
+          claimAmount,
+          claimAll
         );
 
         // Assert
@@ -143,7 +146,8 @@ describe("[Contract] Quest", function () {
         );
 
         // Act
-        const act = () => quest.claim(evidence, player.address, claimAmount);
+        const act = () =>
+          quest.claim(evidence, player.address, claimAmount, false);
 
         // Assert
         await expect(act())
@@ -166,7 +170,8 @@ describe("[Contract] Quest", function () {
         );
 
         // Act
-        const act = () => quest.claim(evidence, player.address, claimAmount);
+        const act = () =>
+          quest.claim(evidence, player.address, claimAmount, false);
 
         // Assert
         await expect(act()).to.be.revertedWith(
@@ -189,7 +194,8 @@ describe("[Contract] Quest", function () {
         );
 
         // Act
-        const act = () => quest.claim(evidence, player.address, claimAmount);
+        const act = () =>
+          quest.claim(evidence, player.address, claimAmount, false);
 
         // Assert
         await expect(act()).to.be.revertedWith("ERROR: No evidence");
@@ -213,7 +219,7 @@ describe("[Contract] Quest", function () {
       const act = () =>
         quest
           .connect(player)
-          .claim(hashToBytes("evidence1"), player.address, 0); // player claims by himself (should throw)
+          .claim(hashToBytes("evidence1"), player.address, 0, true); // player claims by himself (should throw)
 
       // Assert
       await expect(act()).to.be.revertedWith("ERROR: Sender not govern");

packages/hardhat/typechain/Quest.d.ts

@@ -23,7 +23,7 @@ import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
 interface QuestInterface extends ethers.utils.Interface {
   functions: {
     "aragonGovernAddress()": FunctionFragment;
-    "claim(bytes,address,uint256)": FunctionFragment;
+    "claim(bytes,address,uint256,bool)": FunctionFragment;
     "claims(uint256)": FunctionFragment;
     "expireTime()": FunctionFragment;
     "fundsRecoveryAddress()": FunctionFragment;
@@ -39,7 +39,7 @@ interface QuestInterface extends ethers.utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "claim",
-    values: [BytesLike, string, BigNumberish]
+    values: [BytesLike, string, BigNumberish, boolean]
   ): string;
   encodeFunctionData(
     functionFragment: "claims",
@@ -124,13 +124,15 @@ export class Quest extends Contract {
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<ContractTransaction>;
 
-    "claim(bytes,address,uint256)"(
+    "claim(bytes,address,uint256,bool)"(
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<ContractTransaction>;
 
@@ -191,13 +193,15 @@ export class Quest extends Contract {
     _evidence: BytesLike,
     _player: string,
     _amount: BigNumberish,
+    _claimAll: boolean,
     overrides?: Overrides
   ): Promise<ContractTransaction>;
 
-  "claim(bytes,address,uint256)"(
+  "claim(bytes,address,uint256,bool)"(
     _evidence: BytesLike,
     _player: string,
     _amount: BigNumberish,
+    _claimAll: boolean,
     overrides?: Overrides
   ): Promise<ContractTransaction>;
 
@@ -258,13 +262,15 @@ export class Quest extends Contract {
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    "claim(bytes,address,uint256)"(
+    "claim(bytes,address,uint256,bool)"(
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -328,13 +334,15 @@ export class Quest extends Contract {
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<BigNumber>;
 
-    "claim(bytes,address,uint256)"(
+    "claim(bytes,address,uint256,bool)"(
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<BigNumber>;
 
@@ -383,13 +391,15 @@ export class Quest extends Contract {
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<PopulatedTransaction>;
 
-    "claim(bytes,address,uint256)"(
+    "claim(bytes,address,uint256,bool)"(
       _evidence: BytesLike,
       _player: string,
       _amount: BigNumberish,
+      _claimAll: boolean,
       overrides?: Overrides
     ): Promise<PopulatedTransaction>;