Merge pull request #247 from lidofinance/develop

Develop -> Main
lidofinance · Feb 21, 2024 · a1d05f1 · a1d05f1
2 parents 19c7473 + 895f1da
commit a1d05f1
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 11 deletions.
diff --git a/modules/blockChain/contractAddresses.ts b/modules/blockChain/contractAddresses.ts
@@ -130,6 +130,7 @@ export const RewardsShareProgramRegistry: ChainAddressMap = {
 }
 
 export const SDVTRegistry: ChainAddressMap = {
+  [CHAINS.Mainnet]: '0xaE7B191A31f627b4eB1d4DaC64eaB9976995b433',
   [CHAINS.Goerli]: '0x6370FA71b9Fd83aFC4196ee189a0d348C90E93b0',
   [CHAINS.Holesky]: '0x11a93807078f8BB880c1BD0ee4C387537de4b4b6',
 }

diff --git a/modules/motions/evmAddresses.ts b/modules/motions/evmAddresses.ts
@@ -49,6 +49,22 @@ export const EvmAddressesByChain: EvmAddresses = {
     [MotionType.PmlStablesTopUp]: '0x92a27C4e5e35cFEa112ACaB53851Ec70e2D99a8D',
     [MotionType.AtcStablesTopUp]: '0x1843Bc35d1fD15AbE1913b9f72852a79457C42Ab',
     [MotionType.LegoStablesTopUp]: '0x6AB39a8Be67D9305799c3F8FdFc95Caf3150d17c',
+    [MotionType.SDVTNodeOperatorsAdd]:
+      '0xcAa3AF7460E83E665EEFeC73a7a542E5005C9639',
+    [MotionType.SDVTNodeOperatorsActivate]:
+      '0xCBb418F6f9BFd3525CE6aADe8F74ECFEfe2DB5C8',
+    [MotionType.SDVTNodeOperatorsDeactivate]:
+      '0x8B82C1546D47330335a48406cc3a50Da732672E7',
+    [MotionType.SDVTVettedValidatorsLimitsSet]:
+      '0xD75778b855886Fc5e1eA7D6bFADA9EB68b35C19D',
+    [MotionType.SDVTTargetValidatorLimitsUpdate]:
+      '0x41CF3DbDc939c5115823Fba1432c4EC5E7bD226C',
+    [MotionType.SDVTNodeOperatorRewardAddressesSet]:
+      '0x589e298964b9181D9938B84bB034C3BB9024E2C0',
+    [MotionType.SDVTNodeOperatorNamesSet]:
+      '0x7d509BFF310d9460b1F613e4e40d342201a83Ae4',
+    [MotionType.SDVTNodeOperatorManagerChange]:
+      '0xE31A0599A6772BCf9b2bFc9e25cf941e793c9a7D',
 
     // next motion factories are @deprecated
     // we are keeping them here to display history data

diff --git a/modules/motions/types.ts b/modules/motions/types.ts
@@ -120,6 +120,7 @@ export type Motion = {
   enacted_at?: number
   canceled_at?: number
   rejected_at?: number
+  isOnChain: boolean
 }
 
 export type RawMotionOnchain = PromiseValue<

diff --git a/modules/motions/ui/MotionDescription/DescSDVTNodeOperatorNamesSet.tsx b/modules/motions/ui/MotionDescription/DescSDVTNodeOperatorNamesSet.tsx
@@ -5,6 +5,7 @@ import { useSDVTNodeOperatorsList } from 'modules/motions/hooks/useSDVTNodeOpera
 // SetNodeOperatorNames
 export function DescSDVTNodeOperatorNamesSet({
   callData,
+  isOnChain,
 }: NestProps<SetNodeOperatorNamesAbi['decodeEVMScriptCallData']>) {
   const { data: nodeOperatorsList } = useSDVTNodeOperatorsList()
   return (
@@ -14,8 +15,9 @@ export function DescSDVTNodeOperatorNamesSet({
         const nodeOperator = nodeOperatorsList?.[nodeOperatorId]
         return (
           <div key={nodeOperatorId}>
-            Change Node Operator <b>{nodeOperator ? nodeOperator.name : ''}</b>{' '}
-            (id: {nodeOperatorId}) name to <b>{item.name}</b>
+            Change Node Operator{' '}
+            <b>{nodeOperator && isOnChain ? nodeOperator.name : ''}</b> (id:{' '}
+            {nodeOperatorId}) name to <b>{item.name}</b>
             {index === callData.length - 1 ? '.' : '; '}
           </div>
         )

diff --git a/modules/motions/ui/MotionDescription/DescSDVTNodeOperatorRewardAddressesSet.tsx b/modules/motions/ui/MotionDescription/DescSDVTNodeOperatorRewardAddressesSet.tsx
@@ -6,6 +6,7 @@ import { AddressInlineWithPop } from 'modules/shared/ui/Common/AddressInlineWith
 // SetNodeOperatorRewardAddresses
 export function DescSDVTNodeOperatorRewardAddressesSet({
   callData,
+  isOnChain,
 }: NestProps<SetNodeOperatorRewardAddressesAbi['decodeEVMScriptCallData']>) {
   const { data: nodeOperatorsList } = useSDVTNodeOperatorsList()
   return (
@@ -18,7 +19,7 @@ export function DescSDVTNodeOperatorRewardAddressesSet({
             Change reward address of Node Operator{' '}
             <b>{nodeOperator ? nodeOperator.name : ''}</b> (id: {nodeOperatorId}
             )
-            {nodeOperator?.rewardAddress ? (
+            {nodeOperator?.rewardAddress && isOnChain ? (
               <>
                 {' '}
                 from{' '}

diff --git a/modules/motions/ui/MotionDescription/DescSDVTTargetValidatorLimitsUpdate.tsx b/modules/motions/ui/MotionDescription/DescSDVTTargetValidatorLimitsUpdate.tsx
@@ -5,6 +5,7 @@ import { useSDVTNodeOperatorsList } from 'modules/motions/hooks/useSDVTNodeOpera
 // UpdateTargetValidatorLimits
 export function DescSDVTTargetValidatorLimitsUpdate({
   callData,
+  isOnChain,
 }: NestProps<UpdateTargetValidatorLimitsAbi['decodeEVMScriptCallData']>) {
   const { data: nodeOperatorsList } = useSDVTNodeOperatorsList({
     withSummary: true,
@@ -22,6 +23,7 @@ export function DescSDVTTargetValidatorLimitsUpdate({
             <div key={nodeOperatorId}>
               Disable target validator limit for Node Operator{' '}
               <b>{nodeOperatorName}</b> (id: {nodeOperatorId})
+              {index === callData.length - 1 ? '.' : '; '}
             </div>
           )
         }
@@ -30,7 +32,10 @@ export function DescSDVTTargetValidatorLimitsUpdate({
           <div key={nodeOperatorId}>
             Set target validator limit for Node Operator{' '}
             <b>{nodeOperatorName}</b> (id: {nodeOperatorId}){' '}
-            {`from ${nodeOperator?.targetValidatorsCount} to ${item.targetLimit}`}
+            {nodeOperator && isOnChain
+              ? `from ${nodeOperator.targetValidatorsCount} `
+              : ''}
+            {`to ${item.targetLimit}`}
             {index === callData.length - 1 ? '.' : '; '}
           </div>
         )

diff --git a/modules/motions/ui/MotionDescription/DescSDVTVettedValidatorsLimitsSet.tsx b/modules/motions/ui/MotionDescription/DescSDVTVettedValidatorsLimitsSet.tsx
@@ -5,6 +5,7 @@ import { useSDVTNodeOperatorsList } from 'modules/motions/hooks/useSDVTNodeOpera
 // SetVettedValidatorsLimits
 export function DescSDVTVettedValidatorsLimitsSet({
   callData,
+  isOnChain,
 }: NestProps<SetVettedValidatorsLimitsAbi['decodeEVMScriptCallData']>) {
   const { data: nodeOperatorsList } = useSDVTNodeOperatorsList({
     withSummary: true,
@@ -18,7 +19,10 @@ export function DescSDVTVettedValidatorsLimitsSet({
           <div key={nodeOperatorId}>
             Set Node Operator <b>{nodeOperator ? nodeOperator.name : ''}</b>{' '}
             (id: {nodeOperatorId}) vetted validators limit{' '}
-            {`from ${nodeOperator?.totalVettedValidators} to ${item.stakingLimit}`}
+            {nodeOperator && isOnChain
+              ? `from ${nodeOperator.totalVettedValidators} `
+              : ''}
+            {`to ${item.stakingLimit}`}
           </div>
         )
       })}

diff --git a/modules/motions/ui/MotionDescription/MotionDescription.tsx b/modules/motions/ui/MotionDescription/MotionDescription.tsx
@@ -59,6 +59,7 @@ type DescNodeOperatorIncreaseLimitProps = NestProps<
 >
 
 type GenericDescProps = {
+  isOnChain?: boolean
   callData: any
 }
 
@@ -325,7 +326,7 @@ export function MotionDescription({ motion }: Props) {
 
   return (
     <DescWrap>
-      <Desc callData={callData} />
+      <Desc callData={callData} isOnChain={motion.isOnChain} />
     </DescWrap>
   )
 }
diff --git a/modules/motions/ui/MotionDescription/types.ts b/modules/motions/ui/MotionDescription/types.ts
@@ -2,4 +2,5 @@ import { UnpackedPromise } from 'modules/shared/utils/utilTypes'
 
 export type NestProps<C extends (...a: any) => Promise<any>> = {
   callData: UnpackedPromise<ReturnType<C>>
+  isOnChain?: boolean
 }
diff --git a/modules/motions/ui/MotionFormStartNew/Parts/StartNewTopUpWithLimitsAndCustomToken.tsx b/modules/motions/ui/MotionFormStartNew/Parts/StartNewTopUpWithLimitsAndCustomToken.tsx
@@ -139,6 +139,7 @@ export const formParts = ({
       const { watch, setValue, trigger } = useFormContext()
       const selectedPrograms: Program[] = watch(fieldNames.programs)
       const selectedTokenAddress: string = watch(fieldNames.tokenAddress)
+      const selectedTokenDecimals: number = watch(fieldNames.tokenDecimals)
 
       const selectedTokenLabel = useMemo(() => {
         if (!selectedTokenAddress || !allowedTokens?.length) {
@@ -295,7 +296,10 @@ export const formParts = ({
                     rules={{
                       required: 'Field is required',
                       validate: value => {
-                        const tokenError = validateToken(value)
+                        const tokenError = validateToken(
+                          value,
+                          selectedTokenDecimals,
+                        )
                         if (tokenError) {
                           return tokenError
                         }

diff --git a/modules/motions/utils/formatMotionDataOnchain.ts b/modules/motions/utils/formatMotionDataOnchain.ts
@@ -26,6 +26,7 @@ export function formatMotionDataOnchain(rawMotion: RawMotionOnchain): Motion {
     objectionsThreshold: Number(rawMotion.objectionsThreshold),
     objectionsAmount: rawMotion.objectionsAmount,
     evmScriptHash: rawMotion.evmScriptHash,
+    isOnChain: true,
   }
 
   return {

diff --git a/modules/motions/utils/formatMotionDataSubgraph.ts b/modules/motions/utils/formatMotionDataSubgraph.ts
@@ -17,5 +17,6 @@ export function formatMotionDataSubgraph(rawMotion: RawMotionSubgraph): Motion {
     rejected_at: rawMotion.rejected_at
       ? Number(rawMotion.rejected_at)
       : undefined,
+    isOnChain: false,
   }
 }
diff --git a/modules/tokens/utils/validateToken.ts b/modules/tokens/utils/validateToken.ts
@@ -1,13 +1,14 @@
 import { utils } from 'ethers'
+import { DEFAULT_DECIMALS } from 'modules/blockChain/constants'
 
-export const validateToken = (value: string) => {
+export const validateToken = (value: string, decimals = DEFAULT_DECIMALS) => {
   if (Number(value) <= 0) {
-    return 'Must be positive'
+    return 'Value must be positive'
   }
   try {
-    utils.parseEther(value)
+    utils.parseUnits(value, decimals)
     return null
   } catch (_) {
-    return 'Unable to parse'
+    return 'Unable to parse value'
   }
 }