update distribute function (#671)

allo-protocol · Jan 20, 2025 · 8ba3f39 · 8ba3f39
1 parent cf37467
commit 8ba3f39
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/contracts/strategies/_poc/easy-rf/EasyRetroFundingStrategy.sol b/contracts/strategies/_poc/easy-rf/EasyRetroFundingStrategy.sol
@@ -565,8 +565,12 @@ contract EasyRetroFundingStrategy is Native, BaseStrategy, Multicall {
         override
         onlyPoolManager(_sender)
     {
-        if (keccak256(bytes(distributionMetadata.pointer)) != NULL_POINTER) {
-            distributionStarted = true;
+        if (!distributionStarted) {
+            if (keccak256(bytes(distributionMetadata.pointer)) != NULL_POINTER) {
+                distributionStarted = true;
+            } else {
+                revert INVALID();
+            }
         }
 
         // Decode the '_data' to get the distributions

diff --git a/test/foundry/strategies/EasyRFStrategy.t.sol b/test/foundry/strategies/EasyRFStrategy.t.sol
@@ -614,9 +614,13 @@ contract EasyRetroFundingStrategyTest is Test, AlloSetup, RegistrySetupFull, Eve
         // invalid recipientId
         distributions[1] = EasyRetroFundingStrategy.Distribution({index: 1, recipientId: randomAddress(), amount: 2e18});
 
-        vm.prank(address(allo()));
+        vm.warp(poolEndTime + 1);
+        vm.prank(pool_admin());
+        strategy.updateDistribution(Metadata(1, "metadata"));
+
         vm.expectRevert(abi.encodeWithSelector(RECIPIENT_ERROR.selector, profile1_notAMember()));
 
+        vm.prank(address(allo()));
         strategy.distribute(new address[](0), abi.encode(distributions), pool_admin());
     }
 
@@ -645,6 +649,23 @@ contract EasyRetroFundingStrategyTest is Test, AlloSetup, RegistrySetupFull, Eve
         strategy.distribute(new address[](0), abi.encode(distributions), pool_admin());
     }
 
+    function testRevert_distribute_INVALID() public {
+        __register_accept_recipient();
+        __register_recipient2();
+
+        EasyRetroFundingStrategy.Distribution[] memory distributions = new EasyRetroFundingStrategy.Distribution[](2);
+        distributions[0] =
+            EasyRetroFundingStrategy.Distribution({index: 0, recipientId: profile1_notAMember(), amount: 1e18});
+
+        // invalid recipientId
+        distributions[1] = EasyRetroFundingStrategy.Distribution({index: 1, recipientId: randomAddress(), amount: 2e18});
+
+        vm.prank(address(allo()));
+        vm.expectRevert(INVALID.selector);
+
+        strategy.distribute(new address[](0), abi.encode(distributions), pool_admin());
+    }
+
     /// ====================
     /// ===== Helpers ======
     /// ====================