Merge pull request #124 from bgd-labs/feat/ink

feat: ink permissions

Author: brotherlymite

README.md

@@ -56,6 +56,7 @@ These documents contain tables with the following information:
 |  CELO |  V3 |  [Permissions](./out/CELO-V3.md#contracts) | |--------|--------|--------|
 |  AVALANCHE |  V3 |  [Permissions](./out/AVALANCHE-V3.md#contracts) | |--------|--------|--------|
 |  AVALANCHE |  V2 |  [Permissions](./out/AVALANCHE-V2.md#contracts) | |--------|--------|--------|
+|  INK_WHITELABEL |  V3 |  [Permissions](./out/INK_WHITELABEL-V3.md#contracts) | |--------|--------|--------|
 |  LINEA |  V3 |  [Permissions](./out/LINEA-V3.md#contracts) | |--------|--------|--------|
 |  SCROLL |  V3 |  [Permissions](./out/SCROLL-V3.md#contracts) | |--------|--------|--------|
        

helpers/configs.ts

@@ -59,6 +59,9 @@ import {
   GovernanceV3Soneium,
   AaveV3Soneium,
   MiscSoneium,
+  GovernanceV3InkWhitelabel,
+  AaveV3InkWhitelabel,
+  MiscInkWhitelabel,
 } from '@bgd-labs/aave-address-book';
 import { NetworkConfigs } from './types.js';
 import { ChainId } from '@bgd-labs/toolbox';
@@ -1050,4 +1053,35 @@ export const networkConfigs: NetworkConfigs = {
       },
     },
   },
+  [ChainId.ink]: {
+    name: 'Ink_Whitelabel',
+    rpcUrl: process.env.RPC_INK,
+    explorer: 'https://explorer.inkonchain.com/',
+    addressesNames: {
+      '0x00C2B13eF4F70Bf1827179Fe6d8facF7cFf6AcD2':
+        'Ink emergency-admin multisig',
+      '0x2e8090716C5a25332cf963d454250B88bf04E6dC':
+        'Ink super-admin multisig',
+    },
+    pools: {
+      [Pools.V3]: {
+        aclBlock: 19948732,
+        collectorBlock: 19948732,
+        granularGuardianBlock: 19948732,
+        crossChainControllerBlock: 19948732,
+        permissionsJson: './statics/functionsPermissionsV3.0.1.json',
+        crossChainPermissionsJson: './statics/functionsPermissionsGovV3.json',
+        addressBook: {
+          ...AaveV3InkWhitelabel,
+          ...MiscInkWhitelabel,
+        },
+        governanceAddressBook: {
+          ...GovernanceV3InkWhitelabel,
+          ...MiscInkWhitelabel
+        },
+        addresses: {
+        },
+      },
+    },
+  },
 };

helpers/crossChainControllerLogs.ts

@@ -53,43 +53,42 @@ export const getCCCSendersAndAdapters = async (
   let events: Log[] = [];
   let latestBlockNumber = 0;
 
-  if (
-    pool === Pools.TENDERLY
-  ) {
-    const { logs: preTenderlyForkEvents, currentBlock: preTenderlyForkCurrentBlock } = await getEvents({
-      client,
-      fromBlock,
-      contract: addressBook.CROSS_CHAIN_CONTROLLER,
-      eventTypes: ['SenderUpdated'],
-      maxBlock: networkConfigs[Number(chainId)].pools[pool].tenderlyBlock!,
-      limit
-    });
-
-    const tenderlyProvider = getRpcClientFromUrl(
-      networkConfigs[Number(chainId)].pools[pool].tenderlyRpcUrl!,
-    );
-
-
-    const { logs: tenderlyForkEvents } = await getEvents({
-      client: tenderlyProvider,
-      fromBlock: networkConfigs[Number(chainId)].pools[pool].tenderlyBlock!,
-      contract: addressBook.CROSS_CHAIN_CONTROLLER,
-      eventTypes: ['SenderUpdated'],
-      limit: 999
-    });
-    events = [...preTenderlyForkEvents, ...tenderlyForkEvents];
-
-    latestBlockNumber = preTenderlyForkCurrentBlock;
-  } else {
-    const { logs: networkEvents, currentBlock: eventsCurrentBlock } = await getEvents({
-      client,
-      fromBlock,
-      contract: addressBook.CROSS_CHAIN_CONTROLLER,
-      eventTypes: ['SenderUpdated'],
-      limit
-    });
-    events = networkEvents;
-    latestBlockNumber = eventsCurrentBlock;
+  if (addressBook.CROSS_CHAIN_CONTROLLER) {
+    if (pool === Pools.TENDERLY) {
+      const { logs: preTenderlyForkEvents, currentBlock: preTenderlyForkCurrentBlock } = await getEvents({
+        client,
+        fromBlock,
+        contract: addressBook.CROSS_CHAIN_CONTROLLER,
+        eventTypes: ['SenderUpdated'],
+        maxBlock: networkConfigs[Number(chainId)].pools[pool].tenderlyBlock!,
+        limit
+      });
+
+      const tenderlyProvider = getRpcClientFromUrl(
+        networkConfigs[Number(chainId)].pools[pool].tenderlyRpcUrl!,
+      );
+
+      const { logs: tenderlyForkEvents } = await getEvents({
+        client: tenderlyProvider,
+        fromBlock: networkConfigs[Number(chainId)].pools[pool].tenderlyBlock!,
+        contract: addressBook.CROSS_CHAIN_CONTROLLER,
+        eventTypes: ['SenderUpdated'],
+        limit: 999
+      });
+      events = [...preTenderlyForkEvents, ...tenderlyForkEvents];
+
+      latestBlockNumber = preTenderlyForkCurrentBlock;
+    } else {
+      const { logs: networkEvents, currentBlock: eventsCurrentBlock } = await getEvents({
+        client,
+        fromBlock,
+        contract: addressBook.CROSS_CHAIN_CONTROLLER,
+        eventTypes: ['SenderUpdated'],
+        limit
+      });
+      events = networkEvents;
+      latestBlockNumber = eventsCurrentBlock;
+    }
   }
 
 

helpers/decentralization.ts

@@ -98,6 +98,11 @@ const isOwnedByGov = (
   for (let contractName of Object.keys(govInfo)) {
     const contract = govInfo[contractName];
     if (contract.address.toLowerCase() === address.toLowerCase()) {
+      if (contract.proxyAdmin) {
+        ownerFound = isOwnedByGov(contract.proxyAdmin, govInfo, initialAddress);
+        if (ownerFound) return ownerFound;
+      }
+
       contract.modifiers.forEach((modifierInfo) => {
         if (
           modifierInfo.modifier === 'onlyOwner' ||