fix: continue with deprecation (#216)

Author: sakulstra

bun.lock

@@ -57,21 +57,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@bgd-labs/aave-address-book": "^4.21.0",
+    "@bgd-labs/aave-address-book": "^4.28.1",
     "@bgd-labs/aave-v3-governance-cache": "^1.0.11",
-    "@bgd-labs/js-utils": "^1.4.8",
-    "@bgd-labs/rpc-env": "^2.3.2",
     "@bgd-labs/toolbox": "^0.0.40",
     "@commander-js/extra-typings": "^12.1.0",
     "@inquirer/prompts": "^7.1.0",
-    "blockstore-core": "^5.0.2",
+    "blockstore-core": "^5.0.4",
+    "bs58": "^6.0.0",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.4.1",
     "find-object-paths": "^1.1.0",
     "gray-matter": "^4.0.3",
-    "ipfs-unixfs-importer": "^15.3.1",
+    "ipfs-unixfs-importer": "^15.4.0",
     "json-bigint": "^1.0.0",
     "viem": "^2.22.21",
     "zod": "^3.23.8"

bun.lockb

@@ -1,31 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import {compareStorageLayouts} from '@bgd-labs/js-utils';
 import type {Command} from '@commander-js/extra-typings';
 import {adiDiffReports} from '../reports/adi-diff-reports';
-import {diffReports} from '../reports/diff-reports';
 import {readJsonFile, readJsonString} from '../utils/json';
 
 export function addCommand(program: Command) {
-  program
-    .command('diff-snapshots')
-    .description('generate a snapshot diff report')
-    .argument('<from>')
-    .argument('<to>')
-    .option('-o, --out <string>', 'output path')
-    .option('--stringMode', 'expects input to be a string, not paths')
-    .action(async (_from, _to, options) => {
-      const from = options.stringMode ? readJsonString(_from) : readJsonFile(_from);
-      const to = options.stringMode ? readJsonString(_to) : readJsonFile(_to);
-      const content = await diffReports(from, to);
-      if (options.out) {
-        fs.mkdirSync(path.dirname(options.out), {recursive: true});
-        fs.writeFileSync(options.out, content);
-      } else {
-        console.log(content);
-      }
-    });
-
   program
     .command('adi-diff-snapshots')
     .description('generate a aDI snapshot diff report')
@@ -44,22 +23,4 @@ export function addCommand(program: Command) {
         console.log(content);
       }
     });
-
-  program
-    .command('diff-storage')
-    .description('generate a storage diff')
-    .argument('<from>')
-    .argument('<to>')
-    .option('-o, --out <string>', 'output path')
-    .action(async (_from, _to, options) => {
-      const from = readJsonFile(_from);
-      const to = readJsonFile(_to);
-      const content = await compareStorageLayouts(from, to);
-      if (options.out) {
-        fs.mkdirSync(path.dirname(options.out), {recursive: true});
-        fs.writeFileSync(options.out, content);
-      } else {
-        console.log(content);
-      }
-    });
 }

package.json

@@ -7,9 +7,7 @@ import type {Command} from '@commander-js/extra-typings';
 import {confirm, input, select} from '@inquirer/prompts';
 import {type Hex, encodeAbiParameters, encodeFunctionData, getContract} from 'viem';
 import {HUMAN_READABLE_STATE, getGovernance} from '../govv3/governance';
-import {getPayloadsController} from '../govv3/payloadsController';
 import {getAccountRPL, getBlockRLP} from '../govv3/proofs';
-import {findPayloadsController} from '../govv3/utils/checkAddress';
 import {toAddressLink, toTxLink} from '../govv3/utils/markdownUtils';
 import {DEFAULT_GOVERNANCE, DEFAULT_GOVERNANCE_CLIENT, FORMAT} from '../utils/constants';
 import {logError, logInfo, logSuccess} from '../utils/logger';
@@ -20,7 +18,7 @@ import {fileSystemStorageAdapter} from '@bgd-labs/aave-v3-governance-cache/fileS
 const localCacheAdapter = customStorageProvider(fileSystemStorageAdapter);
 
 import {refreshCache} from '@bgd-labs/aave-v3-governance-cache/refreshCache';
-import {getClient} from '../utils/getClient';
+import {ChainList} from '@bgd-labs/toolbox';
 
 enum DialogOptions {
   DETAILS = 0,
@@ -148,7 +146,7 @@ export function addCommand(program: Command) {
           logInfo('VotingPortal', cache.proposal.votingPortal);
           cache.proposal.payloads.map((payload, ix) => {
             logInfo(`Payload.${ix}.accessLevel`, payload.accessLevel);
-            logInfo(`Payload.${ix}.chain`, getClient(Number(payload.chain)).chain!.name);
+            logInfo(`Payload.${ix}.chain`, ChainList[payload.chain as keyof typeof ChainList].name);
             logInfo(`Payload.${ix}.payloadId`, payload.payloadId);
             logInfo(`Payload.${ix}.payloadsController`, payload.payloadsController);
           });

src/commands/diffSnaphots.ts

@@ -1,7 +1,7 @@
 import {GovernanceV3Ethereum} from '@bgd-labs/aave-address-book';
-import {ChainId} from '@bgd-labs/rpc-env';
 import {describe, expect, it} from 'vitest';
 import {isKnownAddress} from './checkAddress';
+import {ChainId} from '@bgd-labs/toolbox';
 
 describe('isKnownAddress', () => {
   it('should return path on correct network', () => {

src/commands/governance.ts

@@ -296,150 +296,6 @@ exports[`report > should generate a well formatted report 1`] = `
 \`\`\`"
 `;
 
-exports[`report > should generate a well formatted report for 3.0 to 3.1 1`] = `
-"## Reserve changes
-
-### Reserve altered
-
-#### WBTC (0x3C8Ca53ee5661D29d3d3C0732689a4b86947EAF0)
-
-| description | value before | value after |
-| --- | --- | --- |
-| address | null | 0xF9514C867b37D36a5affB003582b1818dA3870eb |
-| baseVariableBorrowRate | null | 0 |
-| maxVariableBorrowRate | null | 640000000000000000000000000 |
-| optimalUsageRatio | null | 450000000000000000000000000 |
-| variableRateSlope1 | null | 40000000000000000000000000 |
-| variableRateSlope2 | null | 600000000000000000000000000 |
-
-
-#### WETH (0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f)
-
-| description | value before | value after |
-| --- | --- | --- |
-| address | null | 0xF9514C867b37D36a5affB003582b1818dA3870eb |
-| baseVariableBorrowRate | null | 0 |
-| maxVariableBorrowRate | null | 640000000000000000000000000 |
-| optimalUsageRatio | null | 450000000000000000000000000 |
-| variableRateSlope1 | null | 40000000000000000000000000 |
-| variableRateSlope2 | null | 600000000000000000000000000 |
-
-
-#### USDX (0xffD4505B3452Dc22f8473616d50503bA9E1710Ac)
-
-| description | value before | value after |
-| --- | --- | --- |
-| ltv | 82.5 % [8250] | 62 % [6200] |
-| liquidationThreshold | 86 % [8600] | 90 % [9000] |
-| liquidationBonus | 5 % | 11 % |
-| address | null | 0xF9514C867b37D36a5affB003582b1818dA3870eb |
-| baseVariableBorrowRate | null | 0 |
-| maxVariableBorrowRate | null | 640000000000000000000000000 |
-| optimalUsageRatio | null | 450000000000000000000000000 |
-| variableRateSlope1 | null | 40000000000000000000000000 |
-| variableRateSlope2 | null | 600000000000000000000000000 |
-
-
-## Raw diff
-
-\`\`\`json
-{
-  "reserves": {
-    "0x3C8Ca53ee5661D29d3d3C0732689a4b86947EAF0": {
-      "address": {
-        "from": null,
-        "to": "0xF9514C867b37D36a5affB003582b1818dA3870eb"
-      },
-      "baseVariableBorrowRate": {
-        "from": null,
-        "to": "0"
-      },
-      "maxVariableBorrowRate": {
-        "from": null,
-        "to": "640000000000000000000000000"
-      },
-      "optimalUsageRatio": {
-        "from": null,
-        "to": "450000000000000000000000000"
-      },
-      "variableRateSlope1": {
-        "from": null,
-        "to": "40000000000000000000000000"
-      },
-      "variableRateSlope2": {
-        "from": null,
-        "to": "600000000000000000000000000"
-      }
-    },
-    "0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f": {
-      "address": {
-        "from": null,
-        "to": "0xF9514C867b37D36a5affB003582b1818dA3870eb"
-      },
-      "baseVariableBorrowRate": {
-        "from": null,
-        "to": "0"
-      },
-      "maxVariableBorrowRate": {
-        "from": null,
-        "to": "640000000000000000000000000"
-      },
-      "optimalUsageRatio": {
-        "from": null,
-        "to": "450000000000000000000000000"
-      },
-      "variableRateSlope1": {
-        "from": null,
-        "to": "40000000000000000000000000"
-      },
-      "variableRateSlope2": {
-        "from": null,
-        "to": "600000000000000000000000000"
-      }
-    },
-    "0xffD4505B3452Dc22f8473616d50503bA9E1710Ac": {
-      "liquidationBonus": {
-        "from": 10500,
-        "to": 11100
-      },
-      "liquidationThreshold": {
-        "from": 8600,
-        "to": 9000
-      },
-      "ltv": {
-        "from": 8250,
-        "to": 6200
-      },
-      "address": {
-        "from": null,
-        "to": "0xF9514C867b37D36a5affB003582b1818dA3870eb"
-      },
-      "baseVariableBorrowRate": {
-        "from": null,
-        "to": "0"
-      },
-      "maxVariableBorrowRate": {
-        "from": null,
-        "to": "640000000000000000000000000"
-      },
-      "optimalUsageRatio": {
-        "from": null,
-        "to": "450000000000000000000000000"
-      },
-      "variableRateSlope1": {
-        "from": null,
-        "to": "40000000000000000000000000"
-      },
-      "variableRateSlope2": {
-        "from": null,
-        "to": "600000000000000000000000000"
-      }
-    }
-  }
-}
-\`\`\`"
-`;
-
 exports[`report > should generate a well formatted report for 3.1 1`] = `
 "## Reserve changes
 

src/govv3/utils/checkAddress.spec.ts

@@ -50,47 +50,6 @@ exports[`reserve > renderReserve > should properly render new reserve 1`] = `
 "
 `;
 
-exports[`reserve > renderReserve > should properly render new reserve with local chain id 1`] = `
-"#### WBTC (0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f)
-
-| description | value |
-| --- | --- |
-| decimals | 8 |
-| isActive | true |
-| isFrozen | false |
-| supplyCap | 2,100 WBTC |
-| borrowCap | 1,115 WBTC |
-| debtCeiling | 1,000 $ [100000] |
-| isSiloed | false |
-| isFlashloanable | false |
-| eModeCategory | 0 |
-| oracle | 0x6ce185860a4963106506C203335A2910413708e9 |
-| oracleDecimals | 8 |
-| oracleDescription | BTC / USD |
-| oracleName | BTC / USD |
-| oracleLatestAnswer | 22519.04551524 |
-| usageAsCollateralEnabled | true |
-| ltv | 70 % [7000] |
-| liquidationThreshold | 75.55 % [7555] |
-| liquidationBonus | 10 % |
-| liquidationProtocolFee | 10 % [1000] |
-| reserveFactor | 20 % [2000] |
-| aToken | 0x078f358208685046a11C85e8ad32895DED33A249 |
-| aTokenImpl | 0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B |
-| variableDebtToken | 0x92b42c66840C7AD907b4BF74879FF3eF7c529473 |
-| variableDebtTokenImpl | 0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3 |
-| stableDebtToken | 0x633b207Dd676331c413D4C013a6294B0FE47cD0e |
-| stableDebtTokenImpl | 0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e |
-| borrowingEnabled | true |
-| stableBorrowRateEnabled | false |
-| isBorrowableInIsolation | false |
-| interestRateStrategy | 0x9b34E3e183c9b0d1a08fF57a8fb59c821616295f |
-| aTokenUnderlyingBalance | 0 WBTC [0] |
-| virtualAccountingActive | true |
-| virtualBalance | 0 WBTC [0] |
-"
-`;
-
 exports[`reserve > renderReserve > should render decimals 1`] = `
 "#### WBTC ([0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f](https://etherscan.io/address/0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f))
 

src/ipfs/getCachedProposalMetaData.ts

@@ -13,16 +13,6 @@ describe('report', () => {
     },
     {timeout: 30000},
   );
-  it(
-    'should generate a well formatted report for 3.0 to 3.1',
-    async () => {
-      const from = readJsonFile('/src/reports/mocks/pre3-1.json');
-      const to = readJsonFile('/src/reports/mocks/post3-1.json');
-      const content = await diffReports(from, to);
-      expect(content).toMatchSnapshot();
-    },
-    {timeout: 30000},
-  );
   it(
     'should generate a well formatted report for 3.1',
     async () => {