1Hive · Corantin · Feb 10, 2025 · Dec 20, 2024 · Dec 20, 2024 · Jan 4, 2025
diff --git a/pkg/contracts/out/Allo.sol/Allo.json b/pkg/contracts/out/Allo.sol/Allo.json
diff --git a/pkg/contracts/out/CVStrategyHelpers.sol/CVStrategyHelpers.json b/pkg/contracts/out/CVStrategyHelpers.sol/CVStrategyHelpers.json
diff --git a/pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json b/pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json
diff --git a/pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json b/pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json
diff --git a/pkg/contracts/out/CollateralVault.sol/CollateralVault.json b/pkg/contracts/out/CollateralVault.sol/CollateralVault.json
diff --git a/pkg/contracts/out/DeployPassportScorer.s.sol/DeployPassportScorer.json b/pkg/contracts/out/DeployPassportScorer.s.sol/DeployPassportScorer.json
diff --git a/pkg/contracts/out/DeploySafeArbitrator.s.sol/DeploySafeArbitrator.json b/pkg/contracts/out/DeploySafeArbitrator.s.sol/DeploySafeArbitrator.json
diff --git a/pkg/contracts/out/ERC20.sol/ERC20.json b/pkg/contracts/out/ERC20.sol/ERC20.json
diff --git a/pkg/contracts/out/ERC20/IERC20.sol/IERC20.json b/pkg/contracts/out/ERC20/IERC20.sol/IERC20.json
diff --git a/pkg/contracts/out/FAllo.sol/FAllo.json b/pkg/contracts/out/FAllo.sol/FAllo.json
diff --git a/pkg/contracts/out/GV2ERC20.sol/GV2ERC20.json b/pkg/contracts/out/GV2ERC20.sol/GV2ERC20.json
diff --git a/pkg/contracts/out/IAllo.sol/IAllo.json b/pkg/contracts/out/IAllo.sol/IAllo.json
diff --git a/pkg/contracts/out/IArbitrator.sol/IArbitrator.json b/pkg/contracts/out/IArbitrator.sol/IArbitrator.json
diff --git a/pkg/contracts/out/ICollateralVault.sol/ICollateralVault.json b/pkg/contracts/out/ICollateralVault.sol/ICollateralVault.json
diff --git a/pkg/contracts/out/IERC20.sol/IERC20.json b/pkg/contracts/out/IERC20.sol/IERC20.json
diff --git a/pkg/contracts/out/IERC20Metadata.sol/IERC20Metadata.json b/pkg/contracts/out/IERC20Metadata.sol/IERC20Metadata.json
diff --git a/pkg/contracts/out/IERC20Permit.sol/IERC20Permit.json b/pkg/contracts/out/IERC20Permit.sol/IERC20Permit.json
diff --git a/pkg/contracts/out/IERC20Upgradeable.sol/IERC20Upgradeable.json b/pkg/contracts/out/IERC20Upgradeable.sol/IERC20Upgradeable.json
diff --git a/pkg/contracts/out/IRegistry.sol/IRegistry.json b/pkg/contracts/out/IRegistry.sol/IRegistry.json
diff --git a/pkg/contracts/out/IRegistryFactory.sol/IRegistryFactory.json b/pkg/contracts/out/IRegistryFactory.sol/IRegistryFactory.json
diff --git a/pkg/contracts/out/ISafe.sol/Enum.json b/pkg/contracts/out/ISafe.sol/Enum.json
diff --git a/pkg/contracts/out/ISafe.sol/ISafe.json b/pkg/contracts/out/ISafe.sol/ISafe.json
diff --git a/pkg/contracts/out/ISafe.sol/SafeProxyFactory.json b/pkg/contracts/out/ISafe.sol/SafeProxyFactory.json
diff --git a/pkg/contracts/out/MockERC20.sol/MockERC20.json b/pkg/contracts/out/MockERC20.sol/MockERC20.json
diff --git a/pkg/contracts/out/PassportScorer.sol/PassportScorer.json b/pkg/contracts/out/PassportScorer.sol/PassportScorer.json
diff --git a/pkg/contracts/out/PassportScorerWriter.s.sol/PassportScorerWriter.json b/pkg/contracts/out/PassportScorerWriter.s.sol/PassportScorerWriter.json
diff --git a/pkg/contracts/out/Registry.sol/Registry.json b/pkg/contracts/out/Registry.sol/Registry.json
diff --git a/pkg/contracts/out/RegistryCommunityV0_0.sol/RegistryCommunityV0_0.json b/pkg/contracts/out/RegistryCommunityV0_0.sol/RegistryCommunityV0_0.json
diff --git a/pkg/contracts/out/RegistryFactoryDiamond.sol/RegistryFactoryDiamond.json b/pkg/contracts/out/RegistryFactoryDiamond.sol/RegistryFactoryDiamond.json
diff --git a/pkg/contracts/out/RegistryFactoryFacet.sol/RegistryFactoryFacet.json b/pkg/contracts/out/RegistryFactoryFacet.sol/RegistryFactoryFacet.json
diff --git a/pkg/contracts/out/RegistryFactoryV0_0.sol/RegistryFactoryV0_0.json b/pkg/contracts/out/RegistryFactoryV0_0.sol/RegistryFactoryV0_0.json
diff --git a/pkg/contracts/out/RegistryFactoryV0_1.sol/RegistryFactoryV0_1.json b/pkg/contracts/out/RegistryFactoryV0_1.sol/RegistryFactoryV0_1.json
diff --git a/pkg/contracts/out/RegistrySetup.sol/RegistrySetup.json b/pkg/contracts/out/RegistrySetup.sol/RegistrySetup.json
diff --git a/pkg/contracts/out/RegistrySetup.sol/RegistrySetupFull.json b/pkg/contracts/out/RegistrySetup.sol/RegistrySetupFull.json
diff --git a/pkg/contracts/out/SafeArbitrator.sol/SafeArbitrator.json b/pkg/contracts/out/SafeArbitrator.sol/SafeArbitrator.json
diff --git a/pkg/contracts/out/SafeERC20.sol/SafeERC20.json b/pkg/contracts/out/SafeERC20.sol/SafeERC20.json
diff --git a/pkg/contracts/out/SetStrategyPassportScorer.s.sol/SetStrategyPassportScorer.json b/pkg/contracts/out/SetStrategyPassportScorer.s.sol/SetStrategyPassportScorer.json
diff --git a/pkg/contracts/out/TERC20.sol/TERC20.json b/pkg/contracts/out/TERC20.sol/TERC20.json
diff --git a/pkg/contracts/out/UpgradeCVMultichainProd.s.sol/UpgradeCVMultichainProd.json b/pkg/contracts/out/UpgradeCVMultichainProd.s.sol/UpgradeCVMultichainProd.json
diff --git a/pkg/contracts/src/CVStrategy/CVStrategyV0_0.sol b/pkg/contracts/src/CVStrategy/CVStrategyV0_0.sol
@@ -155,6 +155,7 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     // error RegistryCannotBeZero(); // 0x5df4b1ef
     // error SupportUnderflow(uint256 _support, int256 _delta, int256 _result); // 0x3bbc7142
     error NotEnoughPointsToSupport(uint256 pointsSupport, uint256 pointsBalance); // 0xd64182fe
+    error CantDecreaseWhileSupporting();
 
     // error ProposalDataIsEmpty(); //0xc5f7c4c0
     // error ProposalIdCannotBeZero(); //0xf881a10d
@@ -510,13 +511,32 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     function decreasePower(address _member, uint256 _amountToUnstake) external virtual returns (uint256) {
         onlyRegistryCommunity();
         //requireMemberActivatedInStrategies
-
         uint256 pointsToDecrease = 0;
         if (pointSystem == PointSystem.Unlimited || pointSystem == PointSystem.Capped) {
             pointsToDecrease = _amountToUnstake; // from decreasePowerCappedUnlimited(_amountToUnstake)
         } else {
             pointsToDecrease = decreasePowerQuadratic(_member, _amountToUnstake);
         }
+        uint256 voterStake = totalVoterStakePct[_member];
+        uint256 unusedPower = registryCommunity.getMemberPowerInStrategy(_member, address(this)) - voterStake;
+        if (unusedPower < pointsToDecrease) {
+            uint256 removedRatio = (pointsToDecrease  << 128) / voterStake;
+            for(uint256 i=0; i < voterStakedProposals[_member].length; i++) {
+                uint256 proposalId = voterStakedProposals[_member][i];
+                Proposal storage proposal = proposals[proposalId];
+                uint256 stakedPoints = proposal.voterStakedPoints[_member];
+                //This calculation is right ?
+                uint256 newStakedPoints = stakedPoints - ((stakedPoints * removedRatio + (1 << 127)) >> 128);
+                uint256 oldStake = proposal.stakedAmount;
+                proposal.stakedAmount -= stakedPoints - newStakedPoints;
+                proposal.voterStakedPoints[_member] = newStakedPoints;
+                totalStaked -= stakedPoints - newStakedPoints;
+                totalVoterStakePct[_member] -= stakedPoints - newStakedPoints;
+                //Here we pass oldStake??
+                _calculateAndSetConviction(proposal, oldStake);
+                emit SupportAdded(_member, proposalId, 0, proposal.stakedAmount, proposal.convictionLast);
+            }
+        }
         totalPointsActivated -= pointsToDecrease;
         emit PowerDecreased(_member, _amountToUnstake, pointsToDecrease);
         return pointsToDecrease;
@@ -815,9 +835,9 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     }
 
     // Goss: Commented because accessible through public fields
-    // function getProposalStakedAmount(uint256 _proposalId) external view virtual returns (uint256) {
-    //     return proposals[_proposalId].stakedAmount;
-    // }
+    function getProposalStakedAmount(uint256 _proposalId) external view virtual returns (uint256) {
+        return proposals[_proposalId].stakedAmount;
+    }
     //    do a internal function to get the total voter stake
 
     // Goss: Commented because accessible through public fields
@@ -826,28 +846,28 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     // }
 
     // Goss: Commented because accessible through public fields
-    // function getArbitrableConfig()
-    //     external
-    //     view
-    //     virtual
-    //     returns (
-    //         IArbitrator arbitrator,
-    //         address tribunalSafe,
-    //         uint256 submitterCollateralAmount,
-    //         uint256 challengerCollateralAmount,
-    //         uint256 defaultRuling,
-    //         uint256 defaultRulingTimeout
-    //     )
-    // {
-    //     return (
-    //         arbitrableConfigs[currentArbitrableConfigVersion].arbitrator,
-    //         arbitrableConfigs[currentArbitrableConfigVersion].tribunalSafe,
-    //         arbitrableConfigs[currentArbitrableConfigVersion].submitterCollateralAmount,
-    //         arbitrableConfigs[currentArbitrableConfigVersion].challengerCollateralAmount,
-    //         arbitrableConfigs[currentArbitrableConfigVersion].defaultRuling,
-    //         arbitrableConfigs[currentArbitrableConfigVersion].defaultRulingTimeout
-    //     );
-    // }
+    function getArbitrableConfig()
+        external
+        view
+        virtual
+        returns (
+            IArbitrator arbitrator,
+            address tribunalSafe,
+            uint256 submitterCollateralAmount,
+            uint256 challengerCollateralAmount,
+            uint256 defaultRuling,
+            uint256 defaultRulingTimeout
+        )
+    {
+        return (
+            arbitrableConfigs[currentArbitrableConfigVersion].arbitrator,
+            arbitrableConfigs[currentArbitrableConfigVersion].tribunalSafe,
+            arbitrableConfigs[currentArbitrableConfigVersion].submitterCollateralAmount,
+            arbitrableConfigs[currentArbitrableConfigVersion].challengerCollateralAmount,
+            arbitrableConfigs[currentArbitrableConfigVersion].defaultRuling,
+            arbitrableConfigs[currentArbitrableConfigVersion].defaultRulingTimeout
+        );
+    }
 
     function _internal_getProposalVoterStake(uint256 _proposalId, address _voter)
         internal
@@ -946,6 +966,8 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
             // console.log("stakedPointsPct%", stakedPointsPct);
 
             proposal.voterStakedPoints[_sender] = stakedPoints;
+            console.log("proposal.voterStakedPoints[_sender]", proposal.voterStakedPoints[_sender]);
+
 
             // console.log("_sender", _sender);
             // uint2stakedPointsunt = stakedPoints;
@@ -977,6 +999,7 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
                 _calculateAndSetConviction(proposal, previousStakedPoints);
                 emit SupportAdded(_sender, proposalId, stakedPoints, proposal.stakedAmount, proposal.convictionLast);
             }
+            console.log("proposal.stakedAmount", proposal.stakedAmount);
         }
     }