Merge pull request #951 from makerdao/develop

develop -> master

Author: tyler17

modules/delegates/components/DelegatesSystemInfo.tsx

@@ -26,6 +26,7 @@ export function DelegatesSystemInfo({
   className?: string;
 }): React.ReactElement {
   const delegateFactoryAddress = useContractAddress('voteDelegateFactory');
+  const oldDelegateFactoryAddress = useContractAddress('voteDelegateFactoryOld');
   const { network } = useWeb3();
 
   const { data: totalMkr } = useTotalSupply(Tokens.MKR);
@@ -64,7 +65,7 @@ export function DelegatesSystemInfo({
       )
     },
     {
-      title: 'Total Delegators',
+      title: 'Total delegators',
       id: 'total-delegators-system-info',
       value: stats.totalDelegators
     }
@@ -78,7 +79,7 @@ export function DelegatesSystemInfo({
       <Card variant="compact">
         <StackLayout gap={3}>
           <Flex sx={{ justifyContent: 'space-between', flexDirection: 'row' }}>
-            <Text sx={{ fontSize: 3, color: 'textSecondary' }}>Delegate Factory</Text>
+            <Text sx={{ fontSize: 3, color: 'textSecondary' }}>V2 delegate factory</Text>
             {delegateFactoryAddress ? (
               <EtherscanLink type="address" showAddress hash={delegateFactoryAddress} network={network} />
             ) : (
@@ -87,6 +88,16 @@ export function DelegatesSystemInfo({
               </Box>
             )}
           </Flex>
+          <Flex sx={{ justifyContent: 'space-between', flexDirection: 'row' }}>
+            <Text sx={{ fontSize: 3, color: 'textSecondary' }}>V1 delegate factory</Text>
+            {oldDelegateFactoryAddress ? (
+              <EtherscanLink type="address" showAddress hash={oldDelegateFactoryAddress} network={network} />
+            ) : (
+              <Box sx={{ width: 6 }}>
+                <SkeletonThemed />
+              </Box>
+            )}
+          </Flex>
           {statsItems.map(item => (
             <Flex key={item.id} sx={{ justifyContent: 'space-between', flexDirection: 'row' }}>
               <Text sx={{ fontSize: 3, color: 'textSecondary' }}>{item.title}</Text>

modules/migration/delegateAddressLinks.ts

@@ -61,6 +61,12 @@ export const delegateAddressLinks = {
     '0x86F8A04FbAF5c8eD0465624c355c1E3C073213cA': '0xe676e1Aa2419b22699aCCFc12C11761F009dDAF0',
     // BLUE
     '0xE5a7023f78c3c0b7B098e8f4aCE7031B3D9aFBaB': '0xe9e3951535053AF603cbE53b0753361459b74D76',
+    // BLUE V2
+    '0xe9e3951535053AF603cbE53b0753361459b74D76': '0x73056E27D9cc08f963d41664C705392f305cFE7d',
+    // BONAPUBLICA V2
+    '0x694C1Dc8abE434e4b46Fc545B4680cdA1F524F21': '0x79bc4725A6A48C18D94E90C7002b8aF37F20919a',
+    // Cloaky V2
+    '0xe676e1Aa2419b22699aCCFc12C11761F009dDAF0': '0xd352A360CCCB06FB23a8681c44E6b12A999AE7A0'
   }
 };