Fix contracts with coucilsafe transfer, Adapt UI with new contract, l…

…isten to event in subgraph

apps/web/configs/subgraph.json

@@ -1,4 +1,4 @@
 {
-  "VERSION_TESTNET": "0.1.15",
+  "VERSION_TESTNET": "0.1.17",
   "VERSION_PROD": "0.1.4"
 }

broadcast/DeployCVMultiChain.s.sol/421614/run-latest.json

@@ -2529,7 +2529,7 @@
   "libraries": [],
   "pending": [],
   "returns": {},
-  "timestamp": 1729404896,
+  "timestamp": 1730504448,
   "chain": 421614,
   "commit": "aaf9065d"
 }

pkg/contracts/Makefile

@@ -150,10 +150,11 @@ upgrade-arbsep:
 	-vvv
 
 verify-blockscout-arbsep: 
-	-forge script script/DeployCVMultiChain.s.sol:DeployCVMultiChain \
+	-forge script script/UpgradeCVMultichain.s.sol:UpgradeCVMultichain \
 	--rpc-url $(RPC_URL_ARB_TESTNET) \
 	--account pkGarden \
-	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--verifier blockscout \
+	--verifier-url https://arbitrum.blockscout.com/api/ \
 	--verify \
 	--via-ir \
 	--slow
@@ -256,7 +257,7 @@ deploy-new-collateral-vault-template-arbitrum-sepolia:
 	--verify \
 	-vvv
 
-upgrade-and-verify-arbsep: upgrade-arbsep verify-blockscout-arb
+upgrade-and-verify-arbsep: upgrade-arbsep verify-blockscout-arbsep
 
 
 # Arbitrum

pkg/contracts/script/UpgradeCVMultichain.s.sol

@@ -27,8 +27,8 @@ contract UpgradeCVMultichain is BaseMultiChain {
 
         // Upgrades.upgradeProxy(address(registryFactoryProxy), "RegistryFactoryV0_0.sol:RegistryFactoryV0_0", "");
         // abi.encodeWithSelector(RegistryFactoryV0_1.initializeV2.selector)
-        // registryFactory.upgradeTo(registryFactoryImplementation); // DOESNT VALIDATE SAFE UPGRADING
-        // registryFactory.setRegistryCommunityTemplate(registryImplementation);
+        registryFactory.upgradeTo(registryFactoryImplementation); // DOESNT VALIDATE SAFE UPGRADING
+        registryFactory.setRegistryCommunityTemplate(registryImplementation);
         registryFactory.setStrategyTemplate(strategyImplementation);
 
         // REGISTRY COMMUNITIES UPGRADES
@@ -41,7 +41,7 @@ contract UpgradeCVMultichain is BaseMultiChain {
             //     address(registryCommunityProxies[i]), "RegistryCommunityV0_0.sol:RegistryCommunityV0_0", ""
             // );
             // abi.encodeWithSelector(RegistryCommunityV0_0.initializeV2.selector)
-            // registryCommunity.upgradeTo(registryImplementation); // DOESNT VALIDATE SAFE UPGRADING
+            registryCommunity.upgradeTo(registryImplementation); // DOESNT VALIDATE SAFE UPGRADING
             registryCommunity.setStrategyTemplate(strategyImplementation);
         }
 

pkg/contracts/src/RegistryCommunity/RegistryCommunityV0_0.sol

@@ -66,13 +66,14 @@ struct Member {
 }
 
 struct CommunityParams {
-    uint256 registerStakeAmount;
-    bool isKickEnabled;
-    string covenantIpfsHash;
     address councilSafe;
     address feeReceiver;
     uint256 communityFee;
     string communityName;
+    // Empty community only params
+    uint256 registerStakeAmount;
+    bool isKickEnabled;
+    string covenantIpfsHash;
 }
 
 struct Strategies {
@@ -85,7 +86,6 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
     /*|                 EVENTS                     |*/
     /*|--------------------------------------------|*/
 
-    event AlloSet(address _allo);
     event CouncilSafeUpdated(address _safe);
     event CouncilSafeChangeStarted(address _safeOwner, address _newSafeOwner);
     event MemberRegistered(address _member, uint256 _amountStaked);
@@ -97,7 +97,7 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
     event StrategyRemoved(address _strategy);
     event MemberActivatedStrategy(address _member, address _strategy, uint256 _pointsToIncrease);
     event MemberDeactivatedStrategy(address _member, address _strategy);
-    event BasisStakedAmountSet(uint256 _newAmount);
+    event BasisStakedAmountUpdated(uint256 _newAmount);
     event MemberPowerIncreased(address _member, uint256 _stakedAmount);
     event MemberPowerDecreased(address _member, uint256 _unstakedAmount);
     event CommunityNameUpdated(string _communityName);
@@ -113,11 +113,8 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
     error AllowlistTooBig(uint256 size);
     error AddressCannotBeZero();
     error OnlyEmptyCommunity(uint256 totalMembers);
-    error RegistryCannotBeZero();
     error UserNotInCouncil(address _user);
     error UserNotInRegistry();
-    error UserAlreadyRegistered();
-    error UserNotGardenOwner();
     error UserAlreadyActivated();
     error UserAlreadyDeactivated();
     error StrategyExists();
@@ -178,7 +175,7 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
     /// @notice The covenant IPFS hash of community
     string public covenantIpfsHash;
 
-    /// @notice The total number of members in the community 
+    /// @notice The total number of members in the community
     uint256 public totalMembers;
 
     // mapping(address => bool) public tribunalMembers;
@@ -236,6 +233,7 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
             revert OnlyEmptyCommunity(totalMembers);
         }
     }
+
     function onlyStrategyAddress(address _sender, address _strategy) internal pure {
         if (_sender != _strategy) {
             revert SenderNotStrategy();
@@ -260,8 +258,6 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
         collateralVaultTemplate = template;
     }
 
-
-
     // AUDIT: acknowledged upgradeable contract hat does not protect initialize functions,
     // slither-disable-next-line unprotected-upgrade
     function initialize(
@@ -562,9 +558,11 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
         if (msg.sender != pendingCouncilSafe) {
             revert SenderNotNewOwner();
         }
+        _grantRole(COUNCIL_MEMBER, pendingCouncilSafe);
+        _revokeRole(COUNCIL_MEMBER, address(councilSafe));
         councilSafe = ISafe(pendingCouncilSafe);
         delete pendingCouncilSafe;
-        emit CouncilSafeUpdated(pendingCouncilSafe);
+        emit CouncilSafeUpdated(address(councilSafe));
     }
 
     function isMember(address _member) public view virtual returns (bool _isMember) {
@@ -622,22 +620,24 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
         return registerStakeAmount;
     }
 
-    function setBasisStakedAmount(uint256 _newAmount) external virtual {
+    function setBasisStakedAmount(uint256 _newAmount) public virtual {
         onlyCouncilSafe();
         onlyEmptyCommunity();
         registerStakeAmount = _newAmount;
-        emit BasisStakedAmountSet(_newAmount);
+        emit BasisStakedAmountUpdated(_newAmount);
     }
 
-     function setCommunityParams(CommunityParams memory _params) external {
+    function setCommunityParams(CommunityParams memory _params) external {
         onlyCouncilSafe();
-        if(_params.registerStakeAmount != registerStakeAmount || _params.isKickEnabled != isKickEnabled || keccak256(bytes(_params.covenantIpfsHash)) != keccak256(bytes(covenantIpfsHash))) {
+        if (
+            _params.registerStakeAmount != registerStakeAmount || _params.isKickEnabled != isKickEnabled
+                || keccak256(bytes(_params.covenantIpfsHash)) != keccak256(bytes(covenantIpfsHash))
+        ) {
             onlyEmptyCommunity();
-            if (_params.registerStakeAmount != registerStakeAmount){
-                registerStakeAmount = _params.registerStakeAmount;
-                emit BasisStakedAmountSet(_params.registerStakeAmount);
+            if (_params.registerStakeAmount != registerStakeAmount) {
+                setBasisStakedAmount(_params.registerStakeAmount);
             }
-            if (_params.isKickEnabled != isKickEnabled){
+            if (_params.isKickEnabled != isKickEnabled) {
                 isKickEnabled = _params.isKickEnabled;
                 emit KickEnabledUpdated(_params.isKickEnabled);
             }
@@ -646,28 +646,22 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
                 emit CovenantIpfsHashUpdated(_params.covenantIpfsHash);
             }
         }
-        if(keccak256(bytes(_params.communityName)) != keccak256(bytes(communityName))){
+        if (keccak256(bytes(_params.communityName)) != keccak256(bytes(communityName))) {
             communityName = _params.communityName;
             emit CommunityNameUpdated(_params.communityName);
         }
-        if(_params.communityFee != communityFee){
-            communityFee = _params.communityFee;
-            emit CommunityFeeUpdated(_params.communityFee);
+        if (_params.communityFee != communityFee) {
+            setCommunityFee(_params.communityFee);
         }
-        if(_params.feeReceiver != feeReceiver){
-            if (_params.feeReceiver != address(0)){
+        if (_params.feeReceiver != feeReceiver) {
             feeReceiver = _params.feeReceiver;
             emit FeeReceiverChanged(_params.feeReceiver);
-            }
         }
-        if(_params.councilSafe != address(0)){
+        if (_params.councilSafe != address(0)) {
             setCouncilSafe(payable(_params.councilSafe));
-            // event already emitted in setCouncilSafe
         }
     }
 
-
-
     function setCommunityFee(uint256 _newCommunityFee) public virtual {
         onlyCouncilSafe();
         if (_newCommunityFee > MAX_FEE) {
@@ -677,8 +671,6 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
         emit CommunityFeeUpdated(_newCommunityFee);
     }
 
-    //function updateMinimumStake()
-
     function isCouncilMember(address _member) public view virtual returns (bool) {
         return hasRole(COUNCIL_MEMBER, _member);
     }
@@ -704,11 +696,7 @@ contract RegistryCommunityV0_0 is ProxyOwnableUpgrader, ReentrancyGuardUpgradeab
             IPointStrategy(memberStrategies[i]).deactivatePoints(_member);
         }
     }
-    function setKickEnabled() public virtual nonReentrant {
-        onlyCouncilSafe();
-        onlyEmptyCommunity();
-        isKickEnabled = !isKickEnabled;
-    }
+
     function kickMember(address _member, address _transferAddress) public virtual nonReentrant {
         onlyCouncilSafe();
         if (!isKickEnabled) {

pkg/subgraph/package.json

@@ -17,7 +17,7 @@
     "create-local": "graph create --node http://localhost:8020/ kamikazebr/gv2",
     "remove-local": "graph remove --node http://localhost:8020/ kamikazebr/gv2",
     "deploy:local": "pnpm manifest:local && graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 kamikazebr/gv2 -l v0.0.3",
-    "deploy:arbsep": "pnpm manifest:arbsep && graph deploy --studio gv2-arbsepolia",
+    "deploy:arbsep": "pnpm manifest:arbsep && graph deploy --studio gardens-v2---arbitrum-sepolia",
     "deploy:ethsep": "pnpm manifest:ethsep && graph deploy --studio gv2-ethsepolia",
     "deploy:arbitrum": "pnpm manifest:arbitrum && graph deploy --studio gardens-v2---arbitrum",
     "deploy:optimism": "pnpm manifest:optimism && graph deploy --studio gardens-v2---optimism",

pkg/subgraph/src/mappings/registry-community.ts

@@ -23,7 +23,13 @@ import {
   PoolCreated,
   MemberKicked,
   MemberPowerIncreased,
-  MemberPowerDecreased
+  MemberPowerDecreased,
+  CommunityNameUpdated,
+  CovenantIpfsHashUpdated,
+  KickEnabledUpdated,
+  CouncilSafeChangeStarted,
+  CouncilSafeUpdated,
+  BasisStakedAmountUpdated
 } from "../../generated/templates/RegistryCommunityV0_0/RegistryCommunityV0_0";
 
 import { RegistryFactoryV0_0 as RegistryFactoryContract } from "../../generated/RegistryFactoryV0_0/RegistryFactoryV0_0";
@@ -407,6 +413,136 @@ export function handleMemberPowerDecreased(event: MemberPowerDecreased): void {
   newMemberCommunity.save();
 }
 
+/** Need to hanlde the following events:
+ * - handleFeeReceiverChanged
+ * - handleCommunityNameUpdated
+ * handleCovenantIpfsHashUpdated
+ * handleKickEnabledUpdated
+ * handleCouncilSafeChangeStarted
+ * handleCouncilSafeUpdated
+ * handleBasisStakedAmountUpdated
+ */
+
+// export function handleFeeReceiverChanged(event: MemberPowerDecreased): void {
+//   log.debug("RegistryCommunity: handleFeeReceiverChanged: {}", [
+//     event.params._member.toHexString()
+//   ]);
+
+// }
+
+export function handleCommunityNameUpdated(event: CommunityNameUpdated): void {
+  log.debug("RegistryCommunity: handleCommunityNameUpdated: {}", [
+    event.params._communityName
+  ]);
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.communityName = event.params._communityName;
+  community.save();
+}
+
+export function handleCovenantIpfsHashUpdated(
+  event: CovenantIpfsHashUpdated
+): void {
+  log.debug("RegistryCommunity: handleCovenantIpfsHashUpdated: {}", [
+    event.params._covenantIpfsHash
+  ]);
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.covenantIpfsHash = event.params._covenantIpfsHash;
+  community.save();
+}
+
+export function handleKickEnabledUpdated(event: KickEnabledUpdated): void {
+  log.debug("RegistryCommunity: handleKickEnabledUpdated: {}", [
+    event.params._isKickEnabled.toString()
+  ]);
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.isKickEnabled = event.params._isKickEnabled;
+  community.save();
+}
+
+export function handleCouncilSafeChangeStarted(
+  event: CouncilSafeChangeStarted
+): void {
+  log.debug(
+    "RegistryCommunity: handleCouncilSafeChangeStarted: from {} to {}",
+    [
+      event.params._safeOwner.toHexString(),
+      event.params._newSafeOwner.toHexString()
+    ]
+  );
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.pendingNewCouncilSafe = event.params._newSafeOwner.toHexString();
+  community.save();
+}
+
+export function handleCouncilSafeUpdated(event: CouncilSafeUpdated): void {
+  log.debug("RegistryCommunity: handleCouncilSafeUpdated: {}", [
+    event.params._safe.toHexString()
+  ]);
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.councilSafe = event.params._safe.toHexString();
+  community.pendingNewCouncilSafe = null;
+  community.save();
+}
+
+export function handleBasisStakedAmountUpdated(
+  event: BasisStakedAmountUpdated
+): void {
+  log.debug("RegistryCommunity: handleBasisStakedAmountUpdated: {}", [
+    event.params._newAmount.toString()
+  ]);
+
+  let community = RegistryCommunity.load(event.address.toHexString());
+  if (community == null) {
+    log.error("RegistryCommunity: Community not found: {}", [
+      event.address.toHexString()
+    ]);
+    return;
+  }
+
+  community.registerStakeAmount = event.params._newAmount;
+  community.save();
+}
+
 // handler: handleMemberPowerDecreased
 // export function handleMemberPowerDecreased(event: MemberPowerDecreased): void {
 //   log.debug("RegistryCommunity: handleMemberPowerDecreased: member:{} power:{} strategy:{} ", [