chore: update origin (#354)

* chore: update origin * fix: update interfaces
bgd-labs · Nov 21, 2024 · 1bc10cd · 1bc10cd
1 parent dfe9302
commit 1bc10cd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -7,7 +7,6 @@ libs = ['lib']
 remappings = []
 fs_permissions = [{ access = "read-write", path = "./reports" }]
 ffi = true
-solc = '0.8.18'
 evm_version = 'shanghai'
 
 [profile.zksync]

diff --git a/lib/aave-address-book b/lib/aave-address-book
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/scripts/AaveSwapperDeployment.s.sol b/scripts/AaveSwapperDeployment.s.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 
 import {Script} from 'forge-std/Script.sol';
 import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
-import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
+import {ITransparentProxyFactory, ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 
 import {AaveSwapper} from 'src/swaps/AaveSwapper.sol';
 
@@ -13,9 +13,9 @@ contract DeployAaveSwapper is Script {
     vm.startBroadcast();
 
     address aaveSwapper = address(new AaveSwapper());
-    TransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
+    ITransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
       aaveSwapper,
-      MiscEthereum.PROXY_ADMIN,
+      ProxyAdmin(MiscEthereum.PROXY_ADMIN),
       abi.encodeWithSelector(AaveSwapper.initialize.selector)
     );
 

diff --git a/scripts/AaveWstethWithdrawerDeployment.s.sol b/scripts/AaveWstethWithdrawerDeployment.s.sol
@@ -3,20 +3,20 @@ pragma solidity ^0.8.0;
 
 import {Script} from 'forge-std/Script.sol';
 import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
-import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
+import {ITransparentProxyFactory, ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {AaveWstethWithdrawer} from 'src/asset-manager/AaveWstethWithdrawer.sol';
 
 contract DeployAaveWithdrawer is Script {
   function run() external {
     vm.startBroadcast();
 
     address aaveWithdrawer = address(new AaveWstethWithdrawer());
-    TransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
+    ITransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
       aaveWithdrawer,
-      MiscEthereum.PROXY_ADMIN,
+      ProxyAdmin(MiscEthereum.PROXY_ADMIN),
       abi.encodeWithSelector(AaveWstethWithdrawer.initialize.selector)
     );
-    
+
     vm.stopBroadcast();
   }
 }
diff --git a/scripts/V2RateStrategyFactory.s.sol b/scripts/V2RateStrategyFactory.s.sol
@@ -11,7 +11,7 @@ import {AaveV2EthereumAMM} from 'aave-address-book/AaveV2EthereumAMM.sol';
 import {AaveV2Polygon} from 'aave-address-book/AaveV2Polygon.sol';
 import {AaveV2Avalanche} from 'aave-address-book/AaveV2Avalanche.sol';
 import 'solidity-utils/contracts/utils/ScriptUtils.sol';
-import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
+import {ITransparentProxyFactory, ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {V2RateStrategyFactory} from '../src/v2-config-engine/V2RateStrategyFactory.sol';
 
 library DeployV2RatesFactoryLib {
@@ -59,7 +59,7 @@ library DeployV2RatesFactoryLib {
     V2RateStrategyFactory ratesFactory = V2RateStrategyFactory(
       ITransparentProxyFactory(transparentProxyFactory).create(
         address(new V2RateStrategyFactory(addressesProvider)),
-        ownerForFactory,
+        ProxyAdmin(ownerForFactory),
         abi.encodeWithSelector(V2RateStrategyFactory.initialize.selector, uniqueStrategies)
       )
     );
+21 −0		CHANGELOG.md
+1 −1		lib/aave-v3-origin
+2 −2		package-lock.json
+1 −1		package.json
+19 −12		safe.csv
+2 −2		scripts/configs/networks/arbitrum.ts
+2 −2		scripts/configs/networks/avalanche.ts
+2 −2		scripts/configs/networks/base.ts
+1 −1		scripts/configs/networks/bnb.ts
+2 −2		scripts/configs/networks/ethereum.ts
+1 −1		scripts/configs/networks/gnosis.ts
+1 −1		scripts/configs/networks/metis.ts
+2 −2		scripts/configs/networks/optimism.ts
+1 −1		scripts/configs/networks/polygon.ts
+1 −1		scripts/configs/networks/polygonZkEvm.ts
+1 −1		scripts/configs/networks/scroll.ts
+1 −1		scripts/configs/networks/zksync.ts
+2 −0		scripts/configs/pools/ethereum.ts
+20 −0		src/AaveV3Ethereum.sol
+3 −0		src/AaveV3EthereumEtherFi.sol
+3 −0		src/AaveV3EthereumLido.sol
+2 −2		src/MiscArbitrum.sol
+2 −2		src/MiscArbitrumSepolia.sol
+2 −2		src/MiscAvalanche.sol
+2 −2		src/MiscBNB.sol
+2 −2		src/MiscBase.sol
+2 −2		src/MiscBaseSepolia.sol
+2 −2		src/MiscEthereum.sol
+2 −2		src/MiscFuji.sol
+2 −2		src/MiscGnosis.sol
+2 −2		src/MiscMetis.sol
+2 −2		src/MiscOptimism.sol
+2 −2		src/MiscOptimismSepolia.sol
+2 −2		src/MiscPolygon.sol
+2 −2		src/MiscPolygonZkEvm.sol
+2 −2		src/MiscScroll.sol
+2 −2		src/MiscSepolia.sol
+2 −2		src/MiscZkSync.sol
+22 −0		src/ts/AaveV3Ethereum.ts
+3 −0		src/ts/AaveV3EthereumEtherFi.ts
+3 −0		src/ts/AaveV3EthereumLido.ts
+2 −2		src/ts/MiscArbitrum.ts
+2 −2		src/ts/MiscArbitrumSepolia.ts
+2 −2		src/ts/MiscAvalanche.ts
+2 −2		src/ts/MiscBNB.ts
+2 −2		src/ts/MiscBase.ts
+2 −2		src/ts/MiscBaseSepolia.ts
+2 −2		src/ts/MiscEthereum.ts
+2 −2		src/ts/MiscFuji.ts
+2 −2		src/ts/MiscGnosis.ts
+2 −2		src/ts/MiscMetis.ts
+2 −2		src/ts/MiscOptimism.ts
+2 −2		src/ts/MiscOptimismSepolia.ts
+2 −2		src/ts/MiscPolygon.ts
+2 −2		src/ts/MiscPolygonZkEvm.ts
+2 −2		src/ts/MiscScroll.ts
+2 −2		src/ts/MiscSepolia.ts
+2 −2		src/ts/MiscZkSync.ts
+0 −68		tests/__snapshots__/verification.spec.ts.snap
+36 −0		tests/cache/verified.json
+3 −2		tests/verification.spec.ts
+22 −2		tokenlist.json
+89 −0		src/Vm.sol
+2 −3		test/StdChains.t.sol
+2 −2		test/Vm.t.sol