Add support for view function CalculateProposalConviction

Author: Corantin

apps/web/hooks/useConvictionRead.ts

@@ -51,7 +51,7 @@ export const useConvictionRead = ({
     refetch: triggerConvictionRefetch,
   } = useContractRead({
     ...cvStrategyContract,
-    functionName: "updateProposalConviction" as any,
+    functionName: "calculateProposalConviction",
     args: [BigInt(proposalData?.proposalNumber ?? 0)],
     enabled,
   });

broadcast/UpgradeCVMultichainTest.s.sol/421614/run-1731864508.json

@@ -973,6 +973,16 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
         return uint256(result);
     }
 
+
+    function calculateProposalConviction(uint256 _proposalId) public view virtual returns (uint256) {
+        Proposal storage proposal = proposals[_proposalId];
+        return calculateConviction(
+          block.number - proposal.blockLast, 
+          proposal.convictionLast, 
+          proposal.stakedAmount
+        );
+    }
+
     /**
      * @dev Conviction formula: a^t * y(0) + x * (1 - a^t) / (1 - a)
      * Solidity implementation: y = (2^128 * a^t * y0 + x * D * (2^128 - 2^128 * a^t) / (D - aD) + 2^127) / 2^128
@@ -996,6 +1006,7 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
             >> 128;
     }
 
+
     /**
      * @dev Formula: ρ * totalStaked / (1 - a) / (β - requestedAmount / total)**2
      * For the Solidity implementation we amplify ρ and β and simplify the formula:
@@ -1112,7 +1123,6 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
         }
         // calculateConviction and store it
         conviction = calculateConviction(
-            // TODO: Goss -> we should do this math inside the func so UI does not need to fetch latest block
             blockNumber - _proposal.blockLast, // we assert it doesn't overflow above
             _proposal.convictionLast,
             _oldStaked

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

@@ -6,11 +6,11 @@ import {
   MemberStrategy,
   Stake,
   Member,
-  ProposalDispute,
+  ProposalDispute
 } from "../../generated/schema";
 import {
   ProposalDisputeMetadata as ProposalDisputeMetadataTemplate,
-  ProposalMetadata as ProposalMetadataTemplate,
+  ProposalMetadata as ProposalMetadataTemplate
 } from "../../generated/templates";
 
 import {
@@ -692,6 +692,7 @@ function computeInitialize(
   cvs.totalEffectiveActivePoints = cvc.totalEffectiveActivePoints();
   cvs.isEnabled = false;
   cvs.sybilScorer = data.sybilScorer.toHexString();
+  cvs.archived = false;
   config.proposalType = BigInt.fromI32(pType);
   config.pointSystem = BigInt.fromI32(pointSystem);
   config.maxAmount = maxAmount;

pkg/contracts/out/CVStrategyHelpers.sol/CVStrategyHelpers.json

@@ -10,7 +10,7 @@ import {
   MemberStrategy
 } from "../../generated/schema";
 
-import { BigInt, dataSource, ethereum, log } from "@graphprotocol/graph-ts";
+import { BigInt, dataSource, log } from "@graphprotocol/graph-ts";
 import {
   RegistryInitialized,
   RegistryCommunityV0_0 as RegistryCommunityContract,
@@ -32,7 +32,8 @@ import {
   CouncilSafeUpdated,
   CovenantIpfsHashUpdated,
   FeeReceiverChanged,
-  KickEnabledUpdated
+  KickEnabledUpdated,
+  PoolRejected
 } from "../../generated/templates/RegistryCommunityV0_0/RegistryCommunityV0_0";
 
 import { RegistryFactoryV0_0 as RegistryFactoryContract } from "../../generated/RegistryFactoryV0_0/RegistryFactoryV0_0";
@@ -265,6 +266,7 @@ export function handleStrategyAdded(event: StrategyAdded): void {
   }
 
   cvs.isEnabled = true;
+  cvs.archived = false;
   cvs.save();
 }
 
@@ -633,6 +635,23 @@ export function handleFeeReceiverChanged(event: FeeReceiverChanged): void {
   community.save();
 }
 
+export function handlePoolRejected(event: PoolRejected): void {
+  log.debug("RegistryCommunity: handlePoolRejected: strategy:{}", [
+    event.params._strategy.toHexString()
+  ]);
+
+  const strategyAddress = event.params._strategy;
+  const strategy = CVStrategy.load(strategyAddress.toHexString());
+  if (strategy == null) {
+    log.error("RegistryCommunity: Strategy not found: {}", [
+      strategyAddress.toHexString()
+    ]);
+    return;
+  }
+  strategy.archived = true;
+  strategy.save();
+}
+
 // handler: handleMemberPowerDecreased
 // export function handleMemberPowerDecreased(event: MemberPowerDecreased): void {
 //   log.debug("RegistryCommunity: handleMemberPowerDecreased: member:{} power:{} strategy:{} ", [

pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json

@@ -12,6 +12,7 @@ type CVStrategy @entity(immutable: false) {
   isEnabled: Boolean!
   token: String!
   sybilScorer: PassportScorer
+  archived: Boolean!
 }
 
 type CVStrategyConfig @entity(immutable: false) {

pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json

@@ -75,7 +75,9 @@ templates:
         - event: CommunityNameUpdated(string)
           handler: handleCommunityNameUpdated
         - event: FeeReceiverChanged(address)
-          handler: handleFeeReceiverChanged 
+          handler: handleFeeReceiverChanged
+        - event: PoolRejected(address)
+          handler: handlePoolRejected
       file: ./src/mappings/registry-community.ts
 
   - kind: ethereum/contract

pkg/contracts/out/CollateralVault.sol/CollateralVault.json

@@ -6,15 +6,15 @@ schema:
 dataSources:
   - kind: ethereum/contract
     name: RegistryFactoryV0_0
-    network: arbitrum-sepolia
+    network: localhost
     context:
       chainId: 
         type: Int
-        data: 421614
+        data: 1337
     source:
-      address: "0x2689b1e4afcbfb393d9727fba2ab52930035ee85"
+      address: "0xb7f8bc63bbcad18155201308c8f3540b07f84f5e"
       abi: RegistryFactoryV0_0
-      startBlock: 95965509
+      startBlock: 0
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -40,15 +40,15 @@ dataSources:
 
   - kind: ethereum/contract
     name: PassportScorer
-    network: arbitrum-sepolia
+    network: localhost
     context:
       chainId: 
         type: Int
-        data: 421614
+        data: 1337
     source:
-      address: "0x32Fe66622a4D4607241AC723e23Fef487ACDABb5"
+      address: "0x0165878a594ca255338adfa4d48449f69242eb8f"
       abi: PassportScorer
-      startBlock: 95965509
+      startBlock: 0
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -78,7 +78,7 @@ dataSources:
 templates:
   - kind: ethereum/contract
     name: RegistryCommunityV0_0
-    network: arbitrum-sepolia
+    network: localhost
     source:
       abi: RegistryCommunityV0_0
     mapping:
@@ -143,12 +143,14 @@ templates:
         - event: CommunityNameUpdated(string)
           handler: handleCommunityNameUpdated
         - event: FeeReceiverChanged(address)
-          handler: handleFeeReceiverChanged 
+          handler: handleFeeReceiverChanged
+        - event: PoolRejected(address)
+          handler: handlePoolRejected
       file: ./src/mappings/registry-community.ts
 
   - kind: ethereum/contract
     name: CVStrategyV0_0
-    network: arbitrum-sepolia
+    network: localhost
     source:
       abi: CVStrategyV0_0
     mapping:
@@ -207,7 +209,7 @@ templates:
 
   - kind: ethereum/contract
     name: CollateralVault
-    network: arbitrum-sepolia
+    network: localhost
     source:
       abi: CollateralVault
     mapping: