Skip to content

Commit

Permalink
fix: chain chain name from basenet to base (#200)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rustboyar
rustboyar committed Aug 14, 2023
1 parent 7022282 commit dc4a4de
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 67 deletions.
12 changes: 6 additions & 6 deletions scripts/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
metis,
sepolia,
avalanche,
base as basenet,
base,
} from 'viem/chains';

export enum ChainId {
Expand All @@ -39,7 +39,7 @@ export enum ChainId {
sepolia = 11155111,
scroll_alpha = 534353,
metis = 1088,
basenet = 8453,
base = 8453,
}

const RPC_PROVIDERS = {
Expand Down Expand Up @@ -165,8 +165,8 @@ const RPC_PROVIDERS = {
multicall: true,
},
}),
[ChainId.basenet]: createPublicClient({
chain: basenet,
[ChainId.base]: createPublicClient({
chain: base,
transport: http(),
batch: {
multicall: true,
Expand Down Expand Up @@ -629,8 +629,8 @@ export const pools = [
},
},
{
name: 'AaveV3Basenet',
chainId: ChainId.basenet,
name: 'AaveV3Base',
chainId: ChainId.base,
addressProvider: '0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D',
version: 3,
additionalAddresses: {
Expand Down
2 changes: 1 addition & 1 deletion src/AaveAddressBook.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {AaveV3Optimism} from './AaveV3Optimism.sol';
import {AaveV3OptimismGoerli} from './AaveV3OptimismGoerli.sol';
import {AaveV3ScrollAlpha} from './AaveV3ScrollAlpha.sol';
import {AaveV3Metis} from './AaveV3Metis.sol';
import {AaveV3Basenet} from './AaveV3Basenet.sol';
import {AaveV3Base} from './AaveV3Base.sol';

import {AaveGovernanceV2, IGovernanceStrategy} from './AaveGovernanceV2.sol';
import {IAaveEcosystemReserveController, AaveMisc} from './AaveMisc.sol';
5 changes: 2 additions & 3 deletions src/AaveGovernanceV2.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ library AaveGovernanceV2 {

address internal constant METIS_BRIDGE_EXECUTOR = 0x8EC77963068474a45016938Deb95E603Ca82a029;

address internal constant BASENET_BRIDGE_EXECUTOR = 0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45;
address internal constant BASE_BRIDGE_EXECUTOR = 0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45;

// https://github.com/bgd-labs/aave-v3-crosschain-listing-template/tree/master/src/contracts
address internal constant CROSSCHAIN_FORWARDER_POLYGON =
Expand All @@ -535,6 +535,5 @@ library AaveGovernanceV2 {

address internal constant CROSSCHAIN_FORWARDER_METIS = 0x2fE52eF191F0BE1D98459BdaD2F1d3160336C08f;

address internal constant CROSSCHAIN_FORWARDER_BASENET =
0x3215225538da1546FE0DA88ee13019f402078942;
address internal constant CROSSCHAIN_FORWARDER_BASE = 0x3215225538da1546FE0DA88ee13019f402078942;
}
4 changes: 2 additions & 2 deletions src/AaveMisc.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,6 @@ library AaveMisc {
address constant TRANSPARENT_PROXY_FACTORY_METIS = 0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB;
address constant PROXY_ADMIN_METIS = 0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97;

address constant TRANSPARENT_PROXY_FACTORY_BASENET = 0x05225Cd708bCa9253789C1374e4337a019e99D56;
address constant PROXY_ADMIN_BASENET = 0xc85b1E333aecc99340b2320493Fe2d22b8734795;
address constant TRANSPARENT_PROXY_FACTORY_BASE = 0x05225Cd708bCa9253789C1374e4337a019e99D56;
address constant PROXY_ADMIN_BASE = 0xc85b1E333aecc99340b2320493Fe2d22b8734795;
}
2 changes: 1 addition & 1 deletion src/AaveV3Basenet.sol → src/AaveV3Base.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity >=0.6.0;
import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolDataProvider, IACLManager} from './AaveV3.sol';
import {ICollector} from './common/ICollector.sol';

library AaveV3Basenet {
library AaveV3Base {
IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
IPoolAddressesProvider(0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D);

Expand Down
104 changes: 52 additions & 52 deletions src/ts/AaveAddressBook.ts
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
export * as AaveGovernanceV2 from './AaveGovernanceV2';
export * as AaveSafetyModule from './AaveSafetyModule';
export * as AaveGovernanceV2 from './AaveGovernanceV2.js';
export * as AaveSafetyModule from './AaveSafetyModule.js';
// autogenerated entrypoints
export * as AaveV2Ethereum from './AaveV2Ethereum';
export * as AaveV2EthereumAssets from './AaveV2EthereumAssets';
export * as AaveV2EthereumAMM from './AaveV2EthereumAMM';
export * as AaveV2EthereumAMMAssets from './AaveV2EthereumAMMAssets';
export * as AaveV2EthereumArc from './AaveV2EthereumArc';
export * as AaveV2Goerli from './AaveV2Goerli';
export * as AaveV2GoerliAssets from './AaveV2GoerliAssets';
export * as AaveV2Mumbai from './AaveV2Mumbai';
export * as AaveV2MumbaiAssets from './AaveV2MumbaiAssets';
export * as AaveV2Polygon from './AaveV2Polygon';
export * as AaveV2PolygonAssets from './AaveV2PolygonAssets';
export * as AaveV2Fuji from './AaveV2Fuji';
export * as AaveV2FujiAssets from './AaveV2FujiAssets';
export * as AaveV2Avalanche from './AaveV2Avalanche';
export * as AaveV2AvalancheAssets from './AaveV2AvalancheAssets';
export * as AaveV3Ethereum from './AaveV3Ethereum';
export * as AaveV3EthereumAssets from './AaveV3EthereumAssets';
export * as AaveV3Sepolia from './AaveV3Sepolia';
export * as AaveV3SepoliaAssets from './AaveV3SepoliaAssets';
export * as AaveV3Goerli from './AaveV3Goerli';
export * as AaveV3GoerliAssets from './AaveV3GoerliAssets';
export * as AaveV3GoerliGho from './AaveV3GoerliGho';
export * as AaveV3GoerliGhoAssets from './AaveV3GoerliGhoAssets';
export * as AaveV3Mumbai from './AaveV3Mumbai';
export * as AaveV3MumbaiAssets from './AaveV3MumbaiAssets';
export * as AaveV3Polygon from './AaveV3Polygon';
export * as AaveV3PolygonAssets from './AaveV3PolygonAssets';
export * as AaveV3Fuji from './AaveV3Fuji';
export * as AaveV3FujiAssets from './AaveV3FujiAssets';
export * as AaveV3Avalanche from './AaveV3Avalanche';
export * as AaveV3AvalancheAssets from './AaveV3AvalancheAssets';
export * as AaveV3Arbitrum from './AaveV3Arbitrum';
export * as AaveV3ArbitrumAssets from './AaveV3ArbitrumAssets';
export * as AaveV3ArbitrumGoerli from './AaveV3ArbitrumGoerli';
export * as AaveV3ArbitrumGoerliAssets from './AaveV3ArbitrumGoerliAssets';
export * as AaveV3FantomTestnet from './AaveV3FantomTestnet';
export * as AaveV3FantomTestnetAssets from './AaveV3FantomTestnetAssets';
export * as AaveV3Fantom from './AaveV3Fantom';
export * as AaveV3FantomAssets from './AaveV3FantomAssets';
export * as AaveV3Harmony from './AaveV3Harmony';
export * as AaveV3HarmonyAssets from './AaveV3HarmonyAssets';
export * as AaveV3Optimism from './AaveV3Optimism';
export * as AaveV3OptimismAssets from './AaveV3OptimismAssets';
export * as AaveV3OptimismGoerli from './AaveV3OptimismGoerli';
export * as AaveV3OptimismGoerliAssets from './AaveV3OptimismGoerliAssets';
export * as AaveV3ScrollAlpha from './AaveV3ScrollAlpha';
export * as AaveV3ScrollAlphaAssets from './AaveV3ScrollAlphaAssets';
export * as AaveV3Metis from './AaveV3Metis';
export * as AaveV3MetisAssets from './AaveV3MetisAssets';
export * as AaveV3Basenet from './AaveV3Basenet';
export * as AaveV2Ethereum from './AaveV2Ethereum.js';
export * as AaveV2EthereumAssets from './AaveV2EthereumAssets.js';
export * as AaveV2EthereumAMM from './AaveV2EthereumAMM.js';
export * as AaveV2EthereumAMMAssets from './AaveV2EthereumAMMAssets.js';
export * as AaveV2EthereumArc from './AaveV2EthereumArc.js';
export * as AaveV2Goerli from './AaveV2Goerli.js';
export * as AaveV2GoerliAssets from './AaveV2GoerliAssets.js';
export * as AaveV2Mumbai from './AaveV2Mumbai.js';
export * as AaveV2MumbaiAssets from './AaveV2MumbaiAssets.js';
export * as AaveV2Polygon from './AaveV2Polygon.js';
export * as AaveV2PolygonAssets from './AaveV2PolygonAssets.js';
export * as AaveV2Fuji from './AaveV2Fuji.js';
export * as AaveV2FujiAssets from './AaveV2FujiAssets.js';
export * as AaveV2Avalanche from './AaveV2Avalanche.js';
export * as AaveV2AvalancheAssets from './AaveV2AvalancheAssets.js';
export * as AaveV3Ethereum from './AaveV3Ethereum.js';
export * as AaveV3EthereumAssets from './AaveV3EthereumAssets.js';
export * as AaveV3Sepolia from './AaveV3Sepolia.js';
export * as AaveV3SepoliaAssets from './AaveV3SepoliaAssets.js';
export * as AaveV3Goerli from './AaveV3Goerli.js';
export * as AaveV3GoerliAssets from './AaveV3GoerliAssets.js';
export * as AaveV3GoerliGho from './AaveV3GoerliGho.js';
export * as AaveV3GoerliGhoAssets from './AaveV3GoerliGhoAssets.js';
export * as AaveV3Mumbai from './AaveV3Mumbai.js';
export * as AaveV3MumbaiAssets from './AaveV3MumbaiAssets.js';
export * as AaveV3Polygon from './AaveV3Polygon.js';
export * as AaveV3PolygonAssets from './AaveV3PolygonAssets.js';
export * as AaveV3Fuji from './AaveV3Fuji.js';
export * as AaveV3FujiAssets from './AaveV3FujiAssets.js';
export * as AaveV3Avalanche from './AaveV3Avalanche.js';
export * as AaveV3AvalancheAssets from './AaveV3AvalancheAssets.js';
export * as AaveV3Arbitrum from './AaveV3Arbitrum.js';
export * as AaveV3ArbitrumAssets from './AaveV3ArbitrumAssets.js';
export * as AaveV3ArbitrumGoerli from './AaveV3ArbitrumGoerli.js';
export * as AaveV3ArbitrumGoerliAssets from './AaveV3ArbitrumGoerliAssets.js';
export * as AaveV3FantomTestnet from './AaveV3FantomTestnet.js';
export * as AaveV3FantomTestnetAssets from './AaveV3FantomTestnetAssets.js';
export * as AaveV3Fantom from './AaveV3Fantom.js';
export * as AaveV3FantomAssets from './AaveV3FantomAssets.js';
export * as AaveV3Harmony from './AaveV3Harmony.js';
export * as AaveV3HarmonyAssets from './AaveV3HarmonyAssets.js';
export * as AaveV3Optimism from './AaveV3Optimism.js';
export * as AaveV3OptimismAssets from './AaveV3OptimismAssets.js';
export * as AaveV3OptimismGoerli from './AaveV3OptimismGoerli.js';
export * as AaveV3OptimismGoerliAssets from './AaveV3OptimismGoerliAssets.js';
export * as AaveV3ScrollAlpha from './AaveV3ScrollAlpha.js';
export * as AaveV3ScrollAlphaAssets from './AaveV3ScrollAlphaAssets.js';
export * as AaveV3Metis from './AaveV3Metis.js';
export * as AaveV3MetisAssets from './AaveV3MetisAssets.js';
export * as AaveV3Base from './AaveV3Base.js';
4 changes: 2 additions & 2 deletions src/ts/AaveGovernanceV2.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export const POLYGON_BRIDGE_EXECUTOR = '0xdc9A35B16DB4e126cFeDC41322b3a36454B1F7
export const OPTIMISM_BRIDGE_EXECUTOR = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
export const ARBITRUM_BRIDGE_EXECUTOR = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
export const METIS_BRIDGE_EXECUTOR = '0x8EC77963068474a45016938Deb95E603Ca82a029';
export const BASENET_BRIDGE_EXECUTOR = '0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45';
export const BASE_BRIDGE_EXECUTOR = '0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45';
export const CROSSCHAIN_FORWARDER_POLYGON = '0x158a6bC04F0828318821baE797f50B0A1299d45b';
export const CROSSCHAIN_FORWARDER_OPTIMISM = '0x5f5C02875a8e9B5A26fbd09040ABCfDeb2AA6711';
export const CROSSCHAIN_FORWARDER_ARBITRUM = '0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3';
export const CROSSCHAIN_FORWARDER_METIS = '0x2fe52ef191f0be1d98459bdad2f1d3160336c08f';
export const CROSSCHAIN_FORWARDER_BASENET = '0x3215225538da1546FE0DA88ee13019f402078942';
export const CROSSCHAIN_FORWARDER_BASE = '0x3215225538da1546FE0DA88ee13019f402078942';
0 src/ts/AaveV3Basenet.ts → src/ts/AaveV3Base.ts
View file
File renamed without changes.

1 comment on commit dc4a4de

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Foundry report

forge 0.2.0 (dffdfde 2023-08-14T00:16:40.131573198Z)
Build log 
installing solc version "0.8.21"
Successfully installed solc 0.8.21
Compiling 71 files with 0.8.21
Solc 0.8.21 finished in 5.64s
Compiler run successful!
| Contract                   | Size (kB) | Margin (kB) |
|----------------------------|-----------|-------------|
| AaveGovernanceV2           | 0.285     | 24.291      |
| AaveMisc                   | 0.086     | 24.49       |
| AaveV2Avalanche            | 0.086     | 24.49       |
| AaveV2AvalancheAssets      | 0.086     | 24.49       |
| AaveV2Ethereum             | 0.086     | 24.49       |
| AaveV2EthereumAMM          | 0.086     | 24.49       |
| AaveV2EthereumAMMAssets    | 0.086     | 24.49       |
| AaveV2EthereumArc          | 0.086     | 24.49       |
| AaveV2EthereumAssets       | 0.086     | 24.49       |
| AaveV2Fuji                 | 0.086     | 24.49       |
| AaveV2FujiAssets           | 0.086     | 24.49       |
| AaveV2Goerli               | 0.086     | 24.49       |
| AaveV2GoerliAssets         | 0.086     | 24.49       |
| AaveV2Mumbai               | 0.086     | 24.49       |
| AaveV2MumbaiAssets         | 0.086     | 24.49       |
| AaveV2Polygon              | 0.086     | 24.49       |
| AaveV2PolygonAssets        | 0.086     | 24.49       |
| AaveV3Arbitrum             | 0.086     | 24.49       |
| AaveV3ArbitrumAssets       | 0.086     | 24.49       |
| AaveV3ArbitrumGoerli       | 0.086     | 24.49       |
| AaveV3ArbitrumGoerliAssets | 0.086     | 24.49       |
| AaveV3Avalanche            | 0.086     | 24.49       |
| AaveV3AvalancheAssets      | 0.086     | 24.49       |
| AaveV3Base                 | 0.086     | 24.49       |
| AaveV3Ethereum             | 0.086     | 24.49       |
| AaveV3EthereumAssets       | 0.086     | 24.49       |
| AaveV3Fantom               | 0.086     | 24.49       |
| AaveV3FantomAssets         | 0.086     | 24.49       |
| AaveV3FantomTestnet        | 0.086     | 24.49       |
| AaveV3FantomTestnetAssets  | 0.086     | 24.49       |
| AaveV3Fuji                 | 0.086     | 24.49       |
| AaveV3FujiAssets           | 0.086     | 24.49       |
| AaveV3Goerli               | 0.086     | 24.49       |
| AaveV3GoerliAssets         | 0.086     | 24.49       |
| AaveV3GoerliGho            | 0.086     | 24.49       |
| AaveV3GoerliGhoAssets      | 0.086     | 24.49       |
| AaveV3Harmony              | 0.086     | 24.49       |
| AaveV3HarmonyAssets        | 0.086     | 24.49       |
| AaveV3Metis                | 0.086     | 24.49       |
| AaveV3MetisAssets          | 0.086     | 24.49       |
| AaveV3Mumbai               | 0.086     | 24.49       |
| AaveV3MumbaiAssets         | 0.086     | 24.49       |
| AaveV3Optimism             | 0.086     | 24.49       |
| AaveV3OptimismAssets       | 0.086     | 24.49       |
| AaveV3OptimismGoerli       | 0.086     | 24.49       |
| AaveV3OptimismGoerliAssets | 0.086     | 24.49       |
| AaveV3Polygon              | 0.086     | 24.49       |
| AaveV3PolygonAssets        | 0.086     | 24.49       |
| AaveV3ScrollAlpha          | 0.086     | 24.49       |
| AaveV3ScrollAlphaAssets    | 0.086     | 24.49       |
| AaveV3Sepolia              | 0.086     | 24.49       |
| AaveV3SepoliaAssets        | 0.086     | 24.49       |
| ConfiguratorInputTypes     | 0.086     | 24.49       |
| DataTypes                  | 0.086     | 24.49       |
| StdStyle                   | 0.086     | 24.49       |
| console                    | 0.086     | 24.49       |
| console2                   | 0.086     | 24.49       |
| safeconsole                | 0.086     | 24.49       |
| stdError                   | 0.713     | 23.863      |
| stdJson                    | 0.086     | 24.49       |
| stdMath                    | 0.086     | 24.49       |
| stdStorage                 | 0.086     | 24.49       |
| stdStorageSafe             | 0.086     | 24.49       |
Test success 🌈 
No files changed, compilation skipped

Running 1 test for src/test/AaveV2Misfits.t.sol:AaveAddressMisfitsTest
[PASS] testArcPoolAdminIsCorrect() (gas: 258)
Test result: ok. 1 passed; 0 failed; 0 skipped; finished in 413.71µs

Running 8 tests for src/test/AaveV2Ethereum.t.sol:AaveAddressBookTest
[PASS] testAaveProtocolDataProviderIsCorrect() (gas: 280)
[PASS] testCollectorIsCorrect() (gas: 280)
[PASS] testEmergencyAdminIsCorrect() (gas: 237)
[PASS] testOracleIsCorrect() (gas: 258)
[PASS] testPoolAddressIsCorrect() (gas: 281)
[PASS] testPoolAddressProviderIsCorrect() (gas: 302)
[PASS] testPoolAdminIsCorrect() (gas: 302)
[PASS] testPoolConfiguratorIsCorrect() (gas: 268)
Test result: ok. 8 passed; 0 failed; 0 skipped; finished in 695.11µs

Running 8 tests for src/test/AaveV3Avalanche.t.sol:AaveAddressBookTest
[PASS] testACLAdminIsCorrect() (gas: 303)
[PASS] testACLManagerIsCorrect() (gas: 259)
[PASS] testCollectorIsCorrect() (gas: 302)
[PASS] testEmissionManagerIsCorrect() (gas: 280)
[PASS] testOracleIsCorrect() (gas: 280)
[PASS] testPoolAddressIsCorrect() (gas: 258)
[PASS] testPoolAddressProviderIsCorrect() (gas: 302)
[PASS] testPoolConfiguratorIsCorrect() (gas: 268)
Test result: ok. 8 passed; 0 failed; 0 skipped; finished in 547.01µs
Ran 3 test suites: 17 tests passed, 0 failed, 0 skipped (17 total tests)

Please sign in to comment.