Magic number

apps/web/components/Forms/PoolEditForm.tsx

@@ -18,9 +18,9 @@ import { DisputeOutcome, PoolTypes } from "@/types";
 import { abiWithErrors } from "@/utils/abiWithErrors";
 import {
  calculateDecay,
+ calculateMaxRatioNum,
  CV_SCALE_PRECISION,
  ETH_DECIMALS,
- MAX_RATIO_CONSTANT,
 } from "@/utils/numbers";
 import { capitalize } from "@/utils/text";
 
@@ -157,9 +157,9 @@ export default function PoolEditForm({
  spendingLimit = spendingLimit / 100;
  minimumConviction = minimumConviction / 100;
 
- const maxRatioNum = spendingLimit / MAX_RATIO_CONSTANT;
- const weightNum = minimumConviction * maxRatioNum ** 2;
+ const maxRatioNum = calculateMaxRatioNum(spendingLimit, minimumConviction);
 
+ const weightNum = minimumConviction * maxRatioNum ** 2;
  const blockTime = chainConfigMap[chainId].blockTime;
 
  // pool settings
@@ -297,12 +297,12 @@ export default function PoolEditForm({
  }}
  registerOptions={{
  max: {
- value: 100,
- message: "Max amount cannot exceed 100%",
+ value: 99.9,
+ message: "Minimum conviction should be under 100%",
  },
  min: {
  value: 1 / CV_SCALE_PRECISION,
- message: "Amount must be greater than 0",
+ message: "Minimum conviction must be greater than 0",
  },
  }}
  >

apps/web/components/Forms/PoolForm.tsx

@@ -29,10 +29,10 @@ import { getEventFromReceipt } from "@/utils/contracts";
 import { ipfsJsonUpload } from "@/utils/ipfsUtils";
 import {
  calculateDecay,
+ calculateMaxRatioNum,
  CV_PERCENTAGE_SCALE,
  CV_SCALE_PRECISION,
  ETH_DECIMALS,
- MAX_RATIO_CONSTANT,
 } from "@/utils/numbers";
 import { capitalize, ethAddressRegEx } from "@/utils/text";
 
@@ -287,13 +287,13 @@ export function PoolForm({ token, communityAddr }: Props) {
  spendingLimit = spendingLimit / 100;
  minimumConviction = minimumConviction / 100;
 
- const maxRatioNum = spendingLimit / MAX_RATIO_CONSTANT;
+ const maxRatioNum = calculateMaxRatioNum(spendingLimit, minimumConviction);
 
  const weightNum = minimumConviction * maxRatioNum ** 2;
 
  const blockTime = chain.blockTime;
- // pool settings
 
+ // pool settings
  const maxRatio = BigInt(Math.round(maxRatioNum * CV_SCALE_PRECISION));
  const weight = BigInt(Math.round(weightNum * CV_SCALE_PRECISION));
  const decay = BigInt(calculateDecay(blockTime, convictionGrowth));
@@ -824,12 +824,12 @@ export function PoolForm({ token, communityAddr }: Props) {
  }}
  registerOptions={{
  max: {
- value: 100,
- message: "Max amount cannot exceed 100%",
+ value: 99.9,
+ message: "Minimum conviction should be under 100%",
  },
  min: {
  value: 1 / CV_SCALE_PRECISION,
- message: "Amount must be greater than 0",
+ message: "Minimum conviction must be greater than 0",
  },
  }}
  >

apps/web/components/PoolHeader.tsx

@@ -122,7 +122,12 @@ export default function PoolHeader({
  strategy.config.minThresholdPoints,
  +token.decimals,
  );
- const spendingLimit = spendingLimitPct * MAX_RATIO_CONSTANT;
+
+ const spendingLimit =
+ (strategy.config.maxRatio / CV_SCALE_PRECISION) *
+ (1 - Math.sqrt(minimumConviction / 100)) *
+ 100;
+
  const communityAddr = strategy.registryCommunity.id as Address;
  const defaultResolution = arbitrableConfig.defaultRuling;
  const proposalCollateral = arbitrableConfig.submitterCollateralAmount;
@@ -297,7 +302,7 @@ export default function PoolHeader({
  proposalOnDispute={proposalOnDispute}
  initValues={{
  minimumConviction: minimumConviction.toFixed(2),
- convictionGrowth: convictionGrowthSec.toFixed(2),
+ convictionGrowth: convictionGrowthSec.toFixed(4),
  minThresholdPoints: minThresholdPoints,
  spendingLimit: spendingLimit.toFixed(2),
  defaultResolution: defaultResolution,

apps/web/configs/chains.tsx

@@ -80,7 +80,7 @@ export const chainConfigMap: {
  name: arbitrumSepolia.name,
  icon: Arbitrum,
  explorer: "https://arbitrum-sepolia.blockscout.com/",
- blockTime: 0.23,
+ blockTime: 14,
  confirmations: 7,
  rpcUrl: process.env.NEXT_PUBLIC_RPC_URL_ARB_TESTNET!,
  subgraphUrl: `${process.env.NEXT_PUBLIC_SUBGRAPH_URL_ARB_SEP?.replace("/version/latest", "")}/${SUBGRAPH_TESTNET_VERSION}`,

apps/web/utils/numbers.ts

@@ -195,6 +195,13 @@ function calculateDecay(blockTime: number, convictionGrowth: number) {
  return Math.floor(result);
 }
 
+function calculateMaxRatioNum(
+ spendingLimit: number,
+ minimumConviction: number,
+) {
+ return spendingLimit / (1 - Math.sqrt(minimumConviction));
+}
+
 export {
  calculateFees,
  formatTokenAmount,
@@ -204,4 +211,5 @@ export {
  calculatePercentageBigInt,
  calculatePercentage,
  calculateDecay,
+ calculateMaxRatioNum,
 };