forked from bgd-labs/aave-proposals-v3
-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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 Merge Conflicts #14
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat: increase facilitator capacity * feat: add arbitrum side * chore: use igho from libraries * chore: update aave helpers * chore:a dd test * test * forge install: aave-helpers v2.3.0 * add helpers * feat: add e2e test * chore: pr updates
* DRAFT: V3.1 update-1 * tests removed * fix: added deployed payloads. Missing Metis * fix: updated payload addresses for all networks * fix: added AIP text * - Improved v3.1 README * update aave-helpers * Added link to v3 config diffs on v3.1 --------- Co-authored-by: sendra <[email protected]> Co-authored-by: eboado <[email protected]>
* fix: generator isolation flag no longer set wrongfully * fix: apply fix
* feat: add proposal * Update amount * chore: update readme * chore: update readme
Co-authored-by: marczeller <[email protected]>
* fix: Update generator to 3.1 * fix: updated rate types for 3.1 * fix: updated asset listing snapshot * fix: generator rates update * fix: snapshot tests --------- Co-authored-by: Harsh Pandey <[email protected]>
* initial commit * add eth operations * wip tests * wip: eth tests finished * ready for review (?) * fix issues raised in review * change slippages on swaps * wip: lido unstaker * wip * ready for review * initial commit * add eth operations * wip tests * wip: eth tests finished * ready for review (?) * fix issues raised in review * change slippages on swaps * wip: lido unstaker * wip * ready for review * update diffs and config * add expect emit to arbitrum payload * fix oracles * change more oracles, remove unreachable code, fix typo --------- Co-authored-by: defijesus.eth <[email protected]>
|
Foundry report forge 0.2.0 (6822860 2024-07-29T00:20:30.057117769Z) Build logCompiling 150 files with Solc 0.8.19
Solc 0.8.19 finished in 26.13s
Compiler run successful with warnings:
Warning (2072): Unused local variable.
--> src/20240603_Multi_MayFundingUpdate/AaveV3Arbitrum_MayFundingUpdate_20240603.t.sol:48:5:
|
48 | uint256 collectorUsdcBalanceBefore = IERC20(AaveV3ArbitrumAssets.USDC_UNDERLYING).balanceOf(
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2072): Unused local variable.
--> src/20240603_Multi_MayFundingUpdate/AaveV3Arbitrum_MayFundingUpdate_20240603.t.sol:51:5:
|
51 | uint256 collectorAusdcBalanceBefore = IERC20(AaveV3ArbitrumAssets.USDC_A_TOKEN).balanceOf(
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2072): Unused local variable.
--> src/20240603_Multi_MayFundingUpdate/AaveV3Optimism_MayFundingUpdate_20240603.t.sol:41:5:
|
41 | uint256 collectorUsdcBalanceBefore = IERC20(AaveV3OptimismAssets.USDC_UNDERLYING).balanceOf(
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2072): Unused local variable.
--> src/20240603_Multi_MayFundingUpdate/AaveV3Optimism_MayFundingUpdate_20240603.t.sol:44:5:
|
44 | uint256 collectorAusdcBalanceBefore = IERC20(AaveV3OptimismAssets.USDC_A_TOKEN).balanceOf(
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2018): Function state mutability can be restricted to pure
--> lib/aave-helpers/src/ProtocolV3TestBase.sol:354:3:
|
354 | function _logReserveConfig(ReserveConfig memory config) internal view {
| ^ (Relevant source part starts here and spans across multiple lines).
| Contract | Size (B) | Margin (B) |
|------------------------------------------------------------|----------|------------|
| AaveGovernanceV2 | 45 | 24,531 |
| AaveSwapper | 5,572 | 19,004 |
| AaveV2Avalanche | 45 | 24,531 |
| AaveV2AvalancheAssets | 45 | 24,531 |
| AaveV2Ethereum | 45 | 24,531 |
| AaveV2EthereumAMM | 45 | 24,531 |
| AaveV2EthereumAMMAssets | 45 | 24,531 |
| AaveV2EthereumAssets | 45 | 24,531 |
| AaveV2Polygon | 45 | 24,531 |
| AaveV2PolygonAssets | 45 | 24,531 |
| AaveV3Arbitrum | 45 | 24,531 |
| AaveV3ArbitrumAssets | 45 | 24,531 |
| AaveV3ArbitrumEModes | 45 | 24,531 |
| AaveV3Arbitrum_MayFundingUpdate_20240603 | 1,271 | 23,305 |
| AaveV3Avalanche | 45 | 24,531 |
| AaveV3AvalancheAssets | 45 | 24,531 |
| AaveV3AvalancheEModes | 45 | 24,531 |
| AaveV3Base | 45 | 24,531 |
| AaveV3BaseAssets | 45 | 24,531 |
| AaveV3BaseEModes | 45 | 24,531 |
| AaveV3Ethereum | 45 | 24,531 |
| AaveV3EthereumAssets | 45 | 24,531 |
| AaveV3EthereumEModes | 45 | 24,531 |
| AaveV3EthereumLido | 45 | 24,531 |
| AaveV3EthereumLidoAssets | 45 | 24,531 |
| AaveV3EthereumLidoEModes | 45 | 24,531 |
| AaveV3EthereumLido_LidoEthereumInstanceActivation_20240720 | 6,780 | 17,796 |
| AaveV3Ethereum_EventsGrant2024_20240718 | 344 | 24,232 |
| AaveV3Ethereum_MayFundingUpdate_20240603 | 9,444 | 15,132 |
| AaveV3Ethereum_ToolingUpdateAllowance_20240707 | 344 | 24,232 |
| AaveV3Gnosis | 45 | 24,531 |
| AaveV3GnosisAssets | 45 | 24,531 |
| AaveV3GnosisEModes | 45 | 24,531 |
| AaveV3Optimism | 45 | 24,531 |
| AaveV3OptimismAssets | 45 | 24,531 |
| AaveV3OptimismEModes | 45 | 24,531 |
| AaveV3Optimism_MayFundingUpdate_20240603 | 1,207 | 23,369 |
| AaveV3Polygon | 45 | 24,531 |
| AaveV3PolygonAssets | 45 | 24,531 |
| AaveV3PolygonEModes | 45 | 24,531 |
| AaveV3Polygon_MayFundingUpdate_20240603 | 4,900 | 19,676 |
| Address | 45 | 24,531 |
| ChainHelpers | 45 | 24,531 |
| ChainIds | 45 | 24,531 |
| ConfiguratorInputTypes | 45 | 24,531 |
| Create2Utils | 123 | 24,453 |
| DataTypes | 45 | 24,531 |
| EngineFlags | 45 | 24,531 |
| Errors | 4,673 | 19,903 |
| GatewayMock | 251 | 24,325 |
| GovV3Helpers | 2,581 | 21,995 |
| GovV3StorageHelpers | 45 | 24,531 |
| GovernanceV3Arbitrum | 45 | 24,531 |
| GovernanceV3Avalanche | 45 | 24,531 |
| GovernanceV3BNB | 45 | 24,531 |
| GovernanceV3Base | 45 | 24,531 |
| GovernanceV3Ethereum | 45 | 24,531 |
| GovernanceV3Gnosis | 45 | 24,531 |
| GovernanceV3Metis | 45 | 24,531 |
| GovernanceV3Optimism | 45 | 24,531 |
| GovernanceV3Polygon | 45 | 24,531 |
| GovernanceV3PolygonZkEvm | 45 | 24,531 |
| GovernanceV3Scroll | 45 | 24,531 |
| IpfsUtils | 45 | 24,531 |
| MiscEthereum | 45 | 24,531 |
| MiscPolygon | 45 | 24,531 |
| PayloadsControllerUtils | 45 | 24,531 |
| ProxyHelpers | 45 | 24,531 |
| ReserveConfiguration | 130 | 24,446 |
| RewardsDataTypes | 45 | 24,531 |
| SafeERC20 | 45 | 24,531 |
| StorageHelpers | 45 | 24,531 |
| TestNetChainIds | 45 | 24,531 |
| WadRayMath | 45 | 24,531 | Test error
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.