feat: stataToken v2

Makefile

@@ -35,4 +35,5 @@ coverage :; forge coverage --report lcov && \
 download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}
 git-diff :
 	@mkdir -p diffs
+	@npx prettier ${before} ${after} --write
 	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md

foundry.toml

@@ -4,14 +4,17 @@ test = 'tests'
 script = 'scripts'
 optimizer = true
 optimizer_runs = 200
-solc='0.8.19'
+solc = '0.8.20'
 evm_version = 'paris'
 bytecode_hash = 'none'
 out = 'out'
 libs = ['lib']
-remappings = [
+remappings = []
+fs_permissions = [
+    { access = "write", path = "./reports" },
+    { access = "read", path = "./out" },
+    { access = "read", path = "./config" },
 ]
-fs_permissions = [{access = "write", path = "./reports"}, {access = "read", path = "./out" }, {access = "read", path = "./config"}]
 ffi = true
 
 [fuzz]
@@ -25,7 +28,7 @@ avalanche = "${RPC_AVALANCHE}"
 polygon = "${RPC_POLYGON}"
 arbitrum = "${RPC_ARBITRUM}"
 fantom = "${RPC_FANTOM}"
-scroll= "${RPC_SCROLL}"
+scroll = "${RPC_SCROLL}"
 celo = "${RPC_CELO}"
 fantom_testnet = "${RPC_FANTOM_TESTNET}"
 harmony = "${RPC_HARMONY}"
@@ -38,19 +41,19 @@ gnosis = "${RPC_GNOSIS}"
 base = "${RPC_BASE}"
 
 [etherscan]
-mainnet={key="${ETHERSCAN_API_KEY_MAINNET}",chainId=1}
-optimism={key="${ETHERSCAN_API_KEY_OPTIMISM}",chainId=10}
-avalanche={key="${ETHERSCAN_API_KEY_AVALANCHE}",chainId=43114}
-polygon={key="${ETHERSCAN_API_KEY_POLYGON}",chainId=137}
-arbitrum={key="${ETHERSCAN_API_KEY_ARBITRUM}",chainId=42161}
-fantom={key="${ETHERSCAN_API_KEY_FANTOM}",chainId=250}
-scroll={key="${ETHERSCAN_API_KEY_SCROLL}",chainId=534352, url='https://api.scrollscan.com/api\?'}
-celo={key="${ETHERSCAN_API_KEY_CELO}",chainId=42220}
-sepolia={key="${ETHERSCAN_API_KEY_MAINNET}",chainId=11155111}
-mumbai={key="${ETHERSCAN_API_KEY_POLYGON}",chainId=80001}
-amoy={key="${ETHERSCAN_API_KEY_POLYGON}",chainId=80002}
-bnb_testnet={key="${ETHERSCAN_API_KEY_BNB}",chainId=97,url='https://api-testnet.bscscan.com/api'}
-bnb={key="${ETHERSCAN_API_KEY_BNB}",chainId=56,url='https://api.bscscan.com/api'}
-base={key="${ETHERSCAN_API_KEY_BASE}",chain=8453}
-gnosis={key="${ETHERSCAN_API_KEY_GNOSIS}",chainId=100}
+mainnet = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 1 }
+optimism = { key = "${ETHERSCAN_API_KEY_OPTIMISM}", chainId = 10 }
+avalanche = { key = "${ETHERSCAN_API_KEY_AVALANCHE}", chainId = 43114 }
+polygon = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 137 }
+arbitrum = { key = "${ETHERSCAN_API_KEY_ARBITRUM}", chainId = 42161 }
+fantom = { key = "${ETHERSCAN_API_KEY_FANTOM}", chainId = 250 }
+scroll = { key = "${ETHERSCAN_API_KEY_SCROLL}", chainId = 534352, url = 'https://api.scrollscan.com/api\?' }
+celo = { key = "${ETHERSCAN_API_KEY_CELO}", chainId = 42220 }
+sepolia = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 11155111 }
+mumbai = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80001 }
+amoy = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80002 }
+bnb_testnet = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 97, url = 'https://api-testnet.bscscan.com/api' }
+bnb = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 56, url = 'https://api.bscscan.com/api' }
+base = { key = "${ETHERSCAN_API_KEY_BASE}", chain = 8453 }
+gnosis = { key = "${ETHERSCAN_API_KEY_GNOSIS}", chainId = 100 }
 # See more config options https://github.com/gakonst/foundry/tree/master/config

package.json

@@ -22,7 +22,7 @@
     "prettier-plugin-solidity": "^1.1.1"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "^0.16.2",
+    "@bgd-labs/aave-cli": "^0.16.4",
     "catapulta-verify": "^1.1.1"
   }
 }

remappings.txt

@@ -2,4 +2,6 @@ aave-v3-core/=src/core/
 aave-v3-periphery/=src/periphery/
 solidity-utils/=lib/solidity-utils/src/
 forge-std/=lib/forge-std/src/
-ds-test/=lib/forge-std/lib/ds-test/src/
+ds-test/=lib/forge-std/lib/ds-test/src/
+openzeppelin-contracts-upgradeable/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/
+openzeppelin-contracts/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/

scripts/misc/DeployAaveV3MarketBatchedBase.sol

@@ -38,7 +38,7 @@ abstract contract DeployAaveV3MarketBatchedBase is DeployUtils, MarketInput, Scr
     metadataReporter.writeJsonReportMarket(report);
   }
 
-  function _loadWarnings(MarketConfig memory config, DeployFlags memory flags) internal view {
+  function _loadWarnings(MarketConfig memory config, DeployFlags memory flags) internal pure {
     if (config.paraswapAugustusRegistry == address(0)) {
       console.log(
         'Warning: Paraswap Adapters will be skipped at deployment due missing config.paraswapAugustusRegistry'

src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
 import {TransparentProxyFactory, ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
-import {StaticATokenLM} from 'aave-v3-periphery/contracts/static-a-token/StaticATokenLM.sol';
+import {StataTokenV2} from 'aave-v3-periphery/contracts/static-a-token/StataTokenV2.sol';
 import {StaticATokenFactory} from 'aave-v3-periphery/contracts/static-a-token/StaticATokenFactory.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 
@@ -17,7 +17,7 @@ contract AaveV3HelpersProcedureTwo is IErrors {
 
     staticATokenReport.transparentProxyFactory = address(new TransparentProxyFactory());
     staticATokenReport.staticATokenImplementation = address(
-      new StaticATokenLM(IPool(pool), IRewardsController(rewardsController))
+      new StataTokenV2(IPool(pool), IRewardsController(rewardsController))
     );
     staticATokenReport.staticATokenFactoryImplementation = address(
       new StaticATokenFactory(