fix: improve diff (#201)

Author: sakulstra

src/reports/code-diff.spec.ts

@@ -2,24 +2,38 @@ import {describe, expect, it} from 'vitest';
 import pre32 from './mocks/pre3-2.json';
 import post32 from './mocks/post3-2.json';
 import {diffCode, downloadContract} from './code-diff';
-import {diffSlot} from './raw-storage-diff';
+import {diffRawStorage, diffSlot} from './raw-storage-diff';
 
-describe.skip('code diffs', () => {
+describe('code diffs', () => {
   it('should diff slots', () => {
     diffSlot(1, '0x0', {
-      previousValue: '0x4816b2C2895f97fB918f1aE7Da403750a0eE372e',
-      newValue: '0xE5e48Ad1F9D1A894188b483DcF91f4FaD6AbA43b',
+      previousValue: '0x0000000000000000000000003d881c2dc90f00e7a52f06155f77fbec63a779c7',
+      newValue: '0x00000000000000000000000056401d666f486c495566a29249447c2bb8c56bb2',
     });
   });
-  it(
+  it('should diff contracts', async () => {
+    await diffRawStorage(1, {
+      '0x0aa97c284e98396202b6a04024f5e2c65026f3c0': {
+        label: null,
+        balanceDiff: null,
+        stateDiff: {
+          '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc': {
+            previousValue: '0x0000000000000000000000003d881c2dc90f00e7a52f06155f77fbec63a779c7',
+            newValue: '0x00000000000000000000000056401d666f486c495566a29249447c2bb8c56bb2',
+          },
+        },
+      },
+    });
+  });
+  it.skip(
     'should download contract',
     () => {
       downloadContract(pre32.chainId, pre32.poolConfig.poolConfigurator);
     },
     {timeout: 30000},
   );
 
-  it(
+  it.skip(
     'should diff the contract',
     () => {
       const from = downloadContract(pre32.chainId, pre32.poolConfig.poolConfiguratorImpl);

src/reports/raw-storage-diff.ts

@@ -3,20 +3,21 @@ import {bytes32ToAddress} from '../utils/storageSlots';
 import {diffCode, downloadContract} from './code-diff';
 import {RawStorage, SlotDiff} from './snapshot-types';
 import {isKnownAddress} from '../govv3/utils/checkAddress';
-import {Address, getContract, zeroHash} from 'viem';
+import {Address, getContract, isAddress, toBytes, zeroHash} from 'viem';
 import {getClient} from '@bgd-labs/rpc-env';
 import {IPool_ABI} from '@bgd-labs/aave-address-book/abis';
 
 export function diffSlot(chainId: number, address: Address, slot: SlotDiff) {
+  const fromAddress = isAddress(slot.previousValue)
+    ? slot.previousValue
+    : bytes32ToAddress(slot.previousValue);
+  const toAddress = isAddress(slot.newValue) ? slot.newValue : bytes32ToAddress(slot.newValue);
   // pure new deployments cannot be diffed, we just download the code in that case
   if (slot.previousValue == zeroHash) {
-    const toAddress = bytes32ToAddress(slot.newValue);
     const to = downloadContract(chainId, toAddress);
     mkdirSync('./diffs', {recursive: true});
     writeFileSync(`./diffs/${chainId}_${address}_${toAddress}.diff`, readFileSync(to), {});
   } else {
-    const fromAddress = bytes32ToAddress(slot.previousValue);
-    const toAddress = bytes32ToAddress(slot.newValue);
     const from = downloadContract(chainId, fromAddress);
     const to = downloadContract(chainId, toAddress);
     const result = diffCode(from, to);
@@ -50,34 +51,41 @@ export async function diffRawStorage(chainId: number, raw: RawStorage) {
           // ... we might want to fetch the owner in that case
         }
 
-        // Diff code logic libraries
-        if (contractName && contractName[contractName.length - 1] === 'POOL') {
-          const oldPool = getContract({
-            client: getClient(chainId, {}),
-            abi: IPool_ABI,
-            address: bytes32ToAddress(raw[contract].stateDiff[erc1967ImplSlot].previousValue),
-          });
-          const newPool = getContract({
-            client: getClient(chainId, {}),
-            abi: IPool_ABI,
-            address: bytes32ToAddress(raw[contract].stateDiff[erc1967ImplSlot].previousValue),
-          });
-          const addresses = await Promise.all([
-            oldPool.read.getSupplyLogic(),
-            newPool.read.getSupplyLogic(),
-            oldPool.read.getBorrowLogic(),
-            newPool.read.getBorrowLogic(),
-            oldPool.read.getLiquidationLogic(),
-            newPool.read.getLiquidationLogic(),
-            oldPool.read.getPoolLogic(),
-            newPool.read.getPoolLogic(),
-            oldPool.read.getFlashLoanLogic(),
-            newPool.read.getFlashLoanLogic(),
-            oldPool.read.getEModeLogic(),
-            newPool.read.getEModeLogic(),
-          ]);
-          for (let i = 0; i < addresses.length; i = i + 2) {
-            diffSlot(chainId, contract, {previousValue: addresses[i], newValue: addresses[i + 1]});
+        if (contractName) {
+          const path = contractName[0].split('.');
+          // Diff code logic libraries
+          if (path[path.length - 1] === 'POOL') {
+            const oldPool = getContract({
+              client: getClient(chainId, {}),
+              abi: IPool_ABI,
+              address: bytes32ToAddress(raw[contract].stateDiff[erc1967ImplSlot].previousValue),
+            });
+            const newPool = getContract({
+              client: getClient(chainId, {}),
+              abi: IPool_ABI,
+              address: bytes32ToAddress(raw[contract].stateDiff[erc1967ImplSlot].previousValue),
+            });
+            const addresses = await Promise.all([
+              oldPool.read.getSupplyLogic(),
+              newPool.read.getSupplyLogic(),
+              oldPool.read.getBorrowLogic(),
+              newPool.read.getBorrowLogic(),
+              oldPool.read.getLiquidationLogic(),
+              newPool.read.getLiquidationLogic(),
+              oldPool.read.getPoolLogic(),
+              newPool.read.getPoolLogic(),
+              oldPool.read.getFlashLoanLogic(),
+              newPool.read.getFlashLoanLogic(),
+              oldPool.read.getEModeLogic(),
+              newPool.read.getEModeLogic(),
+            ]);
+            console.log('addr', addresses);
+            for (let i = 0; i < addresses.length; i = i + 2) {
+              diffSlot(chainId, contract, {
+                previousValue: addresses[i],
+                newValue: addresses[i + 1],
+              });
+            }
           }
         }
       }