Add blocklist

README.md

@@ -407,6 +407,7 @@ type Output = {
   vaultAddress: string
   mevRecipient: string
   imageUrl: string | null
+  blocklistManager: string
   vaultKeysManager: string
   isSmoothingPool: boolean
   tokenName: string | null
@@ -417,33 +418,40 @@ type Output = {
     createdAt: number
     address: string
   }> | null
+  blocklist: Array<{
+    createdAt: number
+    address: string
+  }> | null
   performance: number
 }
 ```
 
-| Name | Description |
-|------|-------------|
-| `apy` | Current vault apy  |
-| `isErc20` | Does the vault have its own ERC20 token  |
-| `capacity` | Maximum TVL of Vault |
-| `createdAt` | Date of Creation  |
-| `feePercent` | Commission rate  |
-| `isPrivate` | Whether the storage is private  |
-| `vaultAdmin` | Vault administrator address  |
-| `totalAssets` | TVL of Vault  |
-| `feeRecipient` | Vault fee address  |
-| `whitelister` | Whitelist manager  |
-| `vaultAddress` | Address of vault  |
-| `mevRecipient` | Validator fee recipient  |
-| `imageUrl` | Link for vault logo  |
-| `vaultKeysManager` | Keys manager address  |
-| `isSmoothingPool` | Smoothing poll or Vault escrow |
-| `tokenName` | ERC20 token name  |
-| `tokenSymbol` | ERC20 token symbol  |
-| `displayName` | Name of vault  |
-| `description` | Description of vault |
-| `whitelist` | List of authorized users for deposits  |
-| `performance` | Vault performance indicator (percent) |
+| Name               | Description                             |
+|--------------------|-----------------------------------------|
+| `apy`              | Current vault apy                       |
+| `isErc20`          | Does the vault have its own ERC20 token |
+| `capacity`         | Maximum TVL of Vault                    |
+| `createdAt`        | Date of Creation                        |
+| `feePercent`       | Commission rate                         |
+| `isPrivate`        | Whether the storage is private          |
+| `isBlocklist`      | Whether the storage has blocklist       |
+| `vaultAdmin`       | Vault administrator address             |
+| `totalAssets`      | TVL of Vault                            |
+| `feeRecipient`     | Vault fee address                       |
+| `whitelister`      | Whitelist manager                       |
+| `vaultAddress`     | Address of vault                        |
+| `mevRecipient`     | Validator fee recipient                 |
+| `imageUrl`         | Link for vault logo                     |
+| `blocklistManager` | Blocklist manager                       |
+| `vaultKeysManager` | Keys manager address                    |
+| `isSmoothingPool`  | Smoothing poll or Vault escrow          |
+| `tokenName`        | ERC20 token name                        |
+| `tokenSymbol`      | ERC20 token symbol                      |
+| `displayName`      | Name of vault                           |
+| `description`      | Description of vault                    |
+| `whitelist`        | List of authorized users for deposits   |
+| `blocklist`        | List of blocked users for deposits      |
+| `performance`      | Vault performance indicator (percent)   |
 
 #### Example:
 

src/graphql/subgraph/vault/vaultQuery.graphql

@@ -13,13 +13,15 @@ query Vault($address: ID!) {
     tokenName
     feePercent
     totalAssets
+    isBlocklist
     displayName
     description
     whitelister
     keysManager
     tokenSymbol
     feeRecipient
     validatorsRoot
+    blocklistManager
     weeklyApy
   }
   privateVaultAccounts(
@@ -28,4 +30,8 @@ query Vault($address: ID!) {
     createdAt
     address
   }
+  vaultBlockedAccounts(where: { vault: $address }) {
+    createdAt
+    address
+  }
 }

src/methods/vault/requests/getVault/modifyVault.spec.ts

@@ -13,6 +13,7 @@ describe('modifyVault', () => {
       isErc20: true,
       feePercent: 200,
       isPrivate: false,
+      isBlocklist: false,
       performance: '10',
       tokenSymbol: 'mTKN',
       imageUrl: 'mockUrl',
@@ -30,11 +31,16 @@ describe('modifyVault', () => {
       whitelister: '0xeefffd4c23d2e8c845870e273861e7d60df49663',
       keysManager: '0xeefffd4c23d2e8c845870e273861e7d60df49663',
       feeRecipient: '0xeefffd4c23d2e8c845870e273861e7d60df49663',
+      blocklistManager: '0xeefffd4c23d2e8c845870e273861e7d60df49663',
     },
     privateVaultAccounts: [
       { createdAt: '1693395816', address: '0xeefffd4c23d2e8c845870e273861e7d60df49663' },
       { createdAt: '1693395816', address: '0xeefffd4c23d2e8c845870e273861e7d60df49663' },
     ],
+    vaultBlockedAccounts: [
+      { createdAt: '1693395817', address: '0xeefffd4c23d2e8c845870e273861e7d60df49663' },
+      { createdAt: '1693395817', address: '0xeefffd4c23d2e8c845870e273861e7d60df49663' },
+    ],
   }
 
   it('should correctly transform the vault data', () => {
@@ -44,6 +50,7 @@ describe('modifyVault', () => {
       feePercent: 2,
       performance: 10,
       isPrivate: false,
+      isBlocklist: false,
       capacity: '0.001',
       tokenSymbol: 'mTKN',
       imageUrl: 'mockUrl',
@@ -60,6 +67,7 @@ describe('modifyVault', () => {
       feeRecipient: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
       mevRecipient: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
       vaultKeysManager: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
+      blocklistManager: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
       whitelist: [
         {
           createdAt: 1693395816000,
@@ -70,6 +78,16 @@ describe('modifyVault', () => {
           address: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
         },
       ],
+      blocklist: [
+        {
+          createdAt: 1693395817000,
+          address: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
+        },
+        {
+          createdAt: 1693395817000,
+          address: '0xeEFFFD4C23D2E8c845870e273861e7d60Df49663',
+        },
+      ],
     }
 
     const result = modifyVault({
@@ -111,6 +129,20 @@ describe('modifyVault', () => {
     expect(result.whitelist).toEqual([])
   })
 
+  it('should handle empty vaultBlockedAccounts correctly', () => {
+    const mockDataWithoutBlockedAccounts: VaultQueryPayload = {
+      ...mockVaultQueryPayload,
+      vaultBlockedAccounts: [],
+    }
+
+    const result = modifyVault({
+      data: mockDataWithoutBlockedAccounts,
+      network,
+    })
+
+    expect(result.blocklist).toEqual([])
+  })
+
   it('should handle feePercent being 0', () => {
     const mockDataWithZeroFee: VaultQueryPayload = {
       ...mockVaultQueryPayload,

src/methods/vault/requests/getVault/modifyVault.ts

@@ -10,9 +10,14 @@ type ModifyVaultInput = {
   network: Network
 }
 
+const modifyAddress = ({ createdAt, address }: { createdAt: string, address: string }) => ({
+  createdAt: Number(createdAt) * 1000,
+  address: getAddress(address),
+})
+
 const modifyVault = (input: ModifyVaultInput): ModifiedVault => {
   const { data, network } = input
-  const { vault, privateVaultAccounts } = data
+  const { vault, privateVaultAccounts, vaultBlockedAccounts } = data
 
   const {
     admin,
@@ -41,10 +46,9 @@ const modifyVault = (input: ModifyVaultInput): ModifiedVault => {
     vaultKeysManager: getAddress(keysManager),
     apy: Number(weeklyApy),
     whitelister: vault.whitelister ? getAddress(vault.whitelister) : '',
-    whitelist: privateVaultAccounts.map(({ createdAt, address }) => ({
-      createdAt: Number(createdAt) * 1000,
-      address: getAddress(address),
-    })) || [],
+    blocklistManager: vault.blocklistManager ? getAddress(vault.blocklistManager) : '',
+    whitelist: privateVaultAccounts.map(modifyAddress),
+    blocklist: vaultBlockedAccounts.map(modifyAddress),
     mevRecipient: mevEscrow
       ? getAddress(mevEscrow)
       : configs[network].addresses.base.sharedMevEscrow,

src/methods/vault/requests/getVault/types.ts

@@ -1,6 +1,11 @@
 import type { VaultQueryPayload } from '../../../../graphql/subgraph/vault'
 
 
+type ListItem = {
+  createdAt: number
+  address: string
+}
+
 export type ModifiedVault = Omit<
   VaultQueryPayload['vault'],
   'admin' | 'address' | 'mevEscrow' | 'keysManager' | 'weeklyApy' | 'performance' | 'createdAt'
@@ -13,8 +18,6 @@ export type ModifiedVault = Omit<
   mevRecipient: string
   vaultKeysManager: string
   isSmoothingPool: boolean
-  whitelist: Array<{
-    createdAt: number
-    address: string
-  }>
+  whitelist: ListItem[]
+  blocklist: ListItem[]
 }