chore(deps): bump lib/aave-v3-origin from 6948864 to 105baaf

scripts/configs/abis.ts

@@ -3,6 +3,7 @@ import {mainnetProtoV3Pool} from './pools/ethereum';
 
 /**
  * @dev These abis can be inferred directly from code as they exist as a dependency
+ * For contracts that are not unique, the path needs to be prefixed
  */
 export const ABI_INTERFACES = [
  'ICollector',
@@ -15,11 +16,11 @@ export const ABI_INTERFACES = [
  'IGovernancePowerStrategy',
  'IDataWarehouse',
  'IExecutorWithTimelock',
- 'IERC20',
+ 'lib/aave-v3-origin/src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol:IERC20',
  'IERC20Detailed',
  'IAToken',
  'IDefaultInterestRateStrategy',
- 'IAaveOracle',
+ 'lib/aave-v3-origin/src/core/contracts/interfaces/IAaveOracle.sol:IAaveOracle',
  'IExecutor',
  'ICrossChainController',
  'IWithGuardian',
@@ -32,8 +33,8 @@ export const ABI_INTERFACES = [
  'IPoolAddressesProvider',
  'IPoolConfigurator',
  'IStakeToken',
- 'IStaticATokenFactory',
- 'IStaticATokenLM',
+ 'IStataTokenFactory',
+ 'IStataTokenV2',
 ];
 
 /**

scripts/generateABIs.ts

@@ -15,8 +15,11 @@ export async function generateABIs(removeExisting: boolean) {
  } else {
  mkdirSync('./src/ts/abis');
  }
- for (const INTERFACE of ABI_INTERFACES) {
- const {stdout, stderr} = await awaitableExec(`forge inspect ${INTERFACE} abi`);
+ const imports: string[] = [];
+ for (const INTERFACE_PATH of ABI_INTERFACES) {
+ const {stdout, stderr} = await awaitableExec(`forge inspect ${INTERFACE_PATH} abi`);
+ const INTERFACE =
+ INTERFACE_PATH.split(':').length > 1 ? INTERFACE_PATH.split(':')[1] : INTERFACE_PATH;
  if (stderr) {
  throw new Error(`Failed to generate abi for ${INTERFACE}`);
  }

scripts/generator/abis.ts

@@ -2,7 +2,9 @@ import {ABI_INTERFACES, DOWNLOAD_ABI_INTERFACES} from '../configs/abis';
 
 export function generateABIImports() {
  const jsExports: string[] = [];
- for (const INTERFACE of ABI_INTERFACES) {
+ for (const INTERFACE_PATH of ABI_INTERFACES) {
+ const INTERFACE =
+ INTERFACE_PATH.split(':').length > 1 ? INTERFACE_PATH.split(':')[1] : INTERFACE_PATH;
  const varName = `${INTERFACE}_ABI`;
  jsExports.push(`export {${varName}} from './abis/${INTERFACE}';`);
  }

src/AaveV2.sol

@@ -2,8 +2,6 @@
 pragma solidity >=0.6.0;
 pragma experimental ABIEncoderV2;
 
-import {AggregatorInterface} from './common/AggregatorInterface.sol';
-
 library DataTypes {
  // refer to the whitepaper, section 1.1 basic concepts for a formal description of these properties.
  struct ReserveData {

src/test/AaveV2Ethereum.t.sol

@@ -6,8 +6,8 @@ import {AaveV2Ethereum} from '../AaveAddressBook.sol';
 // imports are unused but required so forge inspect can find the source code
 import {IERC20Detailed} from 'aave-v3-origin/core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
 import {IWithGuardian} from 'solidity-utils/contracts/access-control/interfaces/IWithGuardian.sol';
-import {IStaticATokenFactory} from 'aave-v3-origin/periphery/contracts/static-a-token/interfaces/IStaticATokenFactory.sol';
-import {IStaticATokenLM} from 'aave-v3-origin/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol';
+import {IStataTokenFactory} from 'aave-v3-origin/periphery/contracts/static-a-token/interfaces/IStataTokenFactory.sol';
+import {IStataTokenV2} from 'aave-v3-origin/periphery/contracts/static-a-token/interfaces/IStataTokenV2.sol';
 
 contract AaveAddressBookTest is Test {
  function setUp() public {}

src/ts/AaveAddressBook.ts

@@ -90,8 +90,8 @@ export {IPool_ABI} from './abis/IPool';
 export {IPoolAddressesProvider_ABI} from './abis/IPoolAddressesProvider';
 export {IPoolConfigurator_ABI} from './abis/IPoolConfigurator';
 export {IStakeToken_ABI} from './abis/IStakeToken';
-export {IStaticATokenFactory_ABI} from './abis/IStaticATokenFactory';
-export {IStaticATokenLM_ABI} from './abis/IStaticATokenLM';
+export {IStataTokenFactory_ABI} from './abis/IStataTokenFactory';
+export {IStataTokenV2_ABI} from './abis/IStataTokenV2';
 export {IPayloadsControllerDataHelper_ABI} from './abis/IPayloadsControllerDataHelper';
 export {IGovernanceDataHelper_ABI} from './abis/IGovernanceDataHelper';
 export {IMetaDelegateHelper_ABI} from './abis/IMetaDelegateHelper';

src/ts/abis/ICrossChainController.ts

@@ -694,6 +694,25 @@ export const ICrossChainController_ABI = [
  ],
  stateMutability: 'view',
  },
+ {
+ type: 'function',
+ name: 'maxRescue',
+ inputs: [
+ {
+ name: 'erc20Token',
+ type: 'address',
+ internalType: 'address',
+ },
+ ],
+ outputs: [
+ {
+ name: '',
+ type: 'uint256',
+ internalType: 'uint256',
+ },
+ ],
+ stateMutability: 'view',
+ },
  {
  type: 'function',
  name: 'receiveCrossChainMessage',

src/ts/abis/IERC20.ts

@@ -85,7 +85,7 @@ export const IERC20_ABI = [
  name: 'transfer',
  inputs: [
  {
- name: 'to',
+ name: 'recipient',
  type: 'address',
  internalType: 'address',
  },
@@ -109,12 +109,12 @@ export const IERC20_ABI = [
  name: 'transferFrom',
  inputs: [
  {
- name: 'from',
+ name: 'sender',
  type: 'address',
  internalType: 'address',
  },
  {
- name: 'to',
+ name: 'recipient',
  type: 'address',
  internalType: 'address',
  },

src/ts/abis/IPoolConfigurator.ts

@@ -11,7 +11,7 @@ export const IPoolConfigurator_ABI = [
  internalType: 'uint40',
  },
  ],
- stateMutability: 'nonpayable',
+ stateMutability: 'view',
  },
  {
  type: 'function',
@@ -78,7 +78,7 @@ export const IPoolConfigurator_ABI = [
  internalType: 'address',
  },
  ],
- stateMutability: 'nonpayable',
+ stateMutability: 'view',
  },
  {
  type: 'function',
@@ -97,7 +97,7 @@ export const IPoolConfigurator_ABI = [
  internalType: 'uint256',
  },
  ],
- stateMutability: 'nonpayable',
+ stateMutability: 'view',
  },
  {
  type: 'function',

src/ts/abis/IRescuable.ts

@@ -41,6 +41,25 @@ export const IRescuable_ABI = [
  outputs: [],
  stateMutability: 'nonpayable',
  },
+ {
+ type: 'function',
+ name: 'maxRescue',
+ inputs: [
+ {
+ name: 'erc20Token',
+ type: 'address',
+ internalType: 'address',
+ },
+ ],
+ outputs: [
+ {
+ name: '',
+ type: 'uint256',
+ internalType: 'uint256',
+ },
+ ],
+ stateMutability: 'view',
+ },
  {
  type: 'function',
  name: 'whoCanRescue',

src/ts/abis/IStataTokenFactory.ts

@@ -0,0 +1,65 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+export const IStataTokenFactory_ABI = [
+ {
+ type: 'function',
+ name: 'createStataTokens',
+ inputs: [
+ {
+ name: 'underlyings',
+ type: 'address[]',
+ internalType: 'address[]',
+ },
+ ],
+ outputs: [
+ {
+ name: '',
+ type: 'address[]',
+ internalType: 'address[]',
+ },
+ ],
+ stateMutability: 'nonpayable',
+ },
+ {
+ type: 'function',
+ name: 'getStataToken',
+ inputs: [
+ {
+ name: 'underlying',
+ type: 'address',
+ internalType: 'address',
+ },
+ ],
+ outputs: [
+ {
+ name: '',
+ type: 'address',
+ internalType: 'address',
+ },
+ ],
+ stateMutability: 'view',
+ },
+ {
+ type: 'function',
+ name: 'getStataTokens',
+ inputs: [],
+ outputs: [
+ {
+ name: '',
+ type: 'address[]',
+ internalType: 'address[]',
+ },
+ ],
+ stateMutability: 'view',
+ },
+ {
+ type: 'error',
+ name: 'NotListedUnderlying',
+ inputs: [
+ {
+ name: 'underlying',
+ type: 'address',
+ internalType: 'address',
+ },
+ ],
+ },
+] as const;