chore: add plasma and soneium (aave-dao#57)

* chore: add plasma and soneium

* chore: fix snapshot

* chore: fix readme

* chore: fix ci

Author: brotherlymite

.github/workflows/main.yml

@@ -10,6 +10,8 @@ on:
 jobs:
   test-solidity:
     uses: bgd-labs/github-workflows/.github/workflows/foundry-test.yml@main
+    with:
+      compareLcov: false
     secrets: inherit
   test-js:
     uses: bgd-labs/github-workflows/.github/workflows/test-node.yml@main

.prettierrc

@@ -1,8 +1,10 @@
 {
+  "plugins": ["prettier-plugin-solidity"],
   "overrides": [
     {
       "files": "*.sol",
       "options": {
+        "parser": "solidity-parse",
         "printWidth": 100,
         "tabWidth": 2,
         "useTabs": false,

README.md

@@ -106,7 +106,7 @@ The `AaveStewardsInjector` contract also introduces an `EXPIRATION_PERIOD` to di
 
 ```sh
 cp .env.example .env
-npm install
+pnpm install
 forge install
 ```
 
@@ -124,12 +124,12 @@ forge test
 
 ### How to I use the generator tooling to bootstrap the update?
 
-Run `npm run generate` on your terminal in order to start the generator. The generator is a CLI tool which will generate the required helper contract which can be then run to submit updates to the risk steward. The generator will generate the helper contract in the `src/contracts/updates` directory.
+Run `pnpm run generate` on your terminal in order to start the generator. The generator is a CLI tool which will generate the required helper contract which can be then run to submit updates to the risk steward. The generator will generate the helper contract in the `src/contracts/updates` directory.
 
-To get a full list of available commands run `npm run generate --help`
+To get a full list of available commands run `pnpm run generate --help`
 
 ```sh
-npm run generate --help
+pnpm run generate --help
 $ tsx generator/cli --help
 Usage: proposal-generator [options]
 
@@ -148,10 +148,10 @@ Options:
   -h, --help                 display help for command
 ```
 
-Running `npm run generate` you should be able to do the risk updates:
+Running `pnpm run generate` you should be able to do the risk updates:
 
 ```bash
-npm run generate
+pnpm run generate
 
 $ tsx generator/cli
 ? Chains this proposal targets AaveV3Ethereum

foundry.lock

@@ -5,7 +5,7 @@
   "lib/aave-helpers": {
     "branch": {
       "name": "main",
-      "rev": "0e4b0ebef286cdd5bd85b99523cfa3e29245a2b2"
+      "rev": "4f4a6631248c19e895997b072302776b6381dd9b"
     }
   }
 }

foundry.toml

@@ -56,6 +56,8 @@ zksync = "${RPC_ZKSYNC}"
 linea = "${RPC_LINEA}"
 sonic = "${RPC_SONIC}"
 celo = "${RPC_CELO}"
+soneium = "${RPC_SONEIUM}"
+plasma = "${RPC_PLASMA}"
 
 [etherscan]
 mainnet = { key="${ETHERSCAN_API_KEY_MAINNET}", chainId=1 }
@@ -74,5 +76,7 @@ zksync = { key="${ETHERSCAN_API_KEY_ZKSYNC}", chainId= 324 }
 linea = { key="${ETHERSCAN_API_KEY_LINEA}", chain = 59144 }
 sonic = { key="${ETHERSCAN_API_KEY_SONIC}", chain = 146 }
 celo = { key="${ETHERSCAN_API_KEY_CELO}", chain = 42220 }
+soneium = { key="any", chainId=1868, url='https://soneium.blockscout.com/api' }
+plasma = { key="any", chainId=9745 }
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config

generator/cli.ts

@@ -3,22 +3,15 @@ import path from 'path';
 import {Command, Option} from 'commander';
 import {CHAIN_TO_CHAIN_ID, getDate, getPoolChain, pascalCase} from './common';
 import {input, checkbox} from '@inquirer/prompts';
-import {
-  ConfigFile,
-  Options,
-  POOLS,
-  PoolCache,
-  PoolConfigs,
-  PoolIdentifier,
-} from './types';
+import {ConfigFile, Options, POOLS, PoolCache, PoolConfigs, PoolIdentifier} from './types';
 import {capsUpdates} from './features/capsUpdates';
 import {rateUpdatesV3} from './features/rateUpdates';
 import {collateralsUpdates} from './features/collateralsUpdates';
 import {eModeUpdates} from './features/eModeUpdates';
 import {lstPriceCapsUpdates} from './features/lstPriceCapsUpdates';
 import {stablePriceCapsUpdates} from './features/stablePriceCapsUpdates';
 import {generateFiles, writeFiles} from './generator';
-import {getClient} from '@bgd-labs/rpc-env';
+import {getClient} from '@bgd-labs/toolbox';
 import {getBlockNumber} from 'viem/actions';
 
 const program = new Command();
@@ -45,7 +38,7 @@ const FEATURE_MODULES_V3 = [
   collateralsUpdates,
   lstPriceCapsUpdates,
   stablePriceCapsUpdates,
-  eModeUpdates
+  eModeUpdates,
 ];
 
 async function generateDeterministicPoolCache(pool: PoolIdentifier): Promise<PoolCache> {

generator/common.ts

@@ -15,6 +15,8 @@ import {
   linea,
   sonic,
   celo,
+  soneium,
+  plasma,
 } from 'viem/chains';
 
 export const AVAILABLE_CHAINS = [
@@ -34,6 +36,8 @@ export const AVAILABLE_CHAINS = [
   'Linea',
   'Sonic',
   'Celo',
+  'Soneium',
+  'Plasma',
 ] as const;
 
 export function getAssets(pool: PoolIdentifier): string[] {
@@ -123,6 +127,8 @@ export const CHAIN_TO_CHAIN_ID = {
   Linea: linea.id,
   Sonic: sonic.id,
   Celo: celo.id,
+  Soneium: soneium.id,
+  Plasma: plasma.id,
 };
 
 export function flagAsRequired(message: string, required?: boolean) {

generator/features/__snapshots__/capUpdates.spec.ts.snap

@@ -29,7 +29,6 @@ pragma solidity ^0.8.0;
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
 import {RiskStewardsEthereum} from '../../../../scripts/networks/RiskStewardsEthereum.s.sol';
 import {IAaveV3ConfigEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
-
 /**
  * @title test
  * @author test

generator/features/__snapshots__/collateralUpdates.spec.ts.snap

@@ -41,7 +41,6 @@ import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
 import {RiskStewardsEthereum} from '../../../../scripts/networks/RiskStewardsEthereum.s.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
 import {IAaveV3ConfigEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
-
 /**
  * @title test
  * @author test

generator/features/__snapshots__/eModeUpdates.spec.ts.snap

@@ -40,7 +40,6 @@ import {AaveV3EthereumEModes} from 'aave-address-book/AaveV3Ethereum.sol';
 import {RiskStewardsEthereum} from '../../../../scripts/networks/RiskStewardsEthereum.s.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
 import {IAaveV3ConfigEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
-
 /**
  * @title test
  * @author test