Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added zksync to adi test base #321

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: added zksync to adi test base #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8db55fc
fix: added zksync to adi test base
sendra Jul 29, 2024
dd47c92
fix: add correct length
sendra Jul 29, 2024
da9ab68
fix: prettier
sendra Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
[submodule "lib/aave-address-book"]
path = lib/aave-address-book
url = https://github.com/bgd-labs/aave-address-book
branch = feat/ZkSync
2 changes: 1 addition & 1 deletion lib/aave-address-book
Open in desktop
Submodule aave-address-book updated 10 files
+1 −1 lib/aave-v3-origin
+13 −0 scripts/configs/governance/zksync.ts
+13 −0 scripts/configs/networks/zksync.ts
+4 −0 scripts/generateAddresses.ts
+2 −0 src/AaveAddressBook.sol
+20 −0 src/GovernanceV3ZkSync.sol
+11 −0 src/MiscZkSync.sol
+2 −0 src/ts/AaveAddressBook.ts
+13 −0 src/ts/GovernanceV3ZkSync.ts
+8 −0 src/ts/MiscZkSync.ts
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 2 files
+3 −0 src/Vm.sol
+1 −1 test/Vm.t.sol
2 changes: 1 addition & 1 deletion lib/solidity-utils
Open in desktop
Submodule solidity-utils updated 13 files
+2 −0 .env.example
+1 −0 .gitignore
+14 −0 README.md
+21 −0 foundry.toml
+1 −1 lib/forge-std
+75 −0 src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol
+22 −0 src-zksync/contracts/transparent-proxy/interfaces/ITransparentProxyFactoryZkSync.sol
+9 −49 src/contracts/transparent-proxy/TransparentProxyFactory.sol
+74 −0 src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol
+148 −0 src/contracts/utils/ChainHelpers.sol
+105 −0 test-zksync/TransparentProxyFactoryZkSync.t.sol
+8 −7 test/Rescuable721.t.sol
+9 −7 test/TransparentProxyFactory.t.sol
6 changes: 5 additions & 1 deletion src/adi/test/ADITestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {GovernanceV3Base} from 'aave-address-book/GovernanceV3Base.sol';
import {GovernanceV3Arbitrum} from 'aave-address-book/GovernanceV3Arbitrum.sol';
import {GovernanceV3Gnosis} from 'aave-address-book/GovernanceV3Gnosis.sol';
import {GovernanceV3Scroll} from 'aave-address-book/GovernanceV3Scroll.sol';
import {GovernanceV3ZkSync} from 'aave-address-book/GovernanceV3ZkSync.sol';
import {IBaseAdapter} from 'aave-address-book/common/IBaseAdapter.sol';

contract ADITestBase is Test {
Expand Down Expand Up @@ -586,7 +587,7 @@ contract ADITestBase is Test {
uint256 chainId
) internal pure returns (uint256[] memory) {
if (chainId == ChainIds.MAINNET) {
uint256[] memory chainIds = new uint256[](10);
uint256[] memory chainIds = new uint256[](11);
chainIds[0] = ChainIds.MAINNET;
chainIds[1] = ChainIds.POLYGON;
chainIds[2] = ChainIds.AVALANCHE;
Expand All @@ -597,6 +598,7 @@ contract ADITestBase is Test {
chainIds[7] = ChainIds.METIS;
chainIds[8] = ChainIds.BASE;
chainIds[9] = ChainIds.SCROLL;
chainIds[10] = ChainIds.ZK_SYNC;

return chainIds;
} else if (chainId == ChainIds.POLYGON) {
Expand Down Expand Up @@ -672,6 +674,8 @@ contract ADITestBase is Test {
return GovernanceV3Gnosis.CROSS_CHAIN_CONTROLLER;
} else if (chainId == ChainIds.SCROLL) {
return GovernanceV3Scroll.CROSS_CHAIN_CONTROLLER;
} else if (chainId == ChainIds.ZK_SYNC) {
return GovernanceV3ZkSync.CROSS_CHAIN_CONTROLLER;
}
revert();
}
Expand Down
Loading