Skip to content

Commit

Permalink
Merge pull request #728 from aave/feat/3.0.1-typos
Browse files Browse the repository at this point in the history
Feat/3.0.1 typos
  • Loading branch information
miguelmtzinf authored Nov 15, 2022
2 parents 72e0425 + 7dd869f commit 3925b24
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Formal Verification

## Connect with the community

You can join at the [Discord](http://aave.com/discord) channel or at the [Governance Forum](https://governance.aave.com/) for asking questions about the protocol or talk about Aave with other peers.
You can join the [Discord](http://aave.com/discord) channel or the [Governance Forum](https://governance.aave.com/) to ask questions about the protocol or talk about Aave with other peers.

## Getting Started

Expand All @@ -67,7 +67,7 @@ contract Misc {
}
```

The JSON artifacts with the ABI and Bytecode are also included into the bundled NPM package at `artifacts/` directory.
The JSON artifacts with the ABI and Bytecode are also included in the bundled NPM package at `artifacts/` directory.

Import JSON file via Node JS `require`:

Expand All @@ -80,12 +80,12 @@ console.log(PoolV3Artifact.abi)

## Setup

The repository uses Docker Compose to manage sensitive keys and load the configuration. Prior any action like test or deploy, you must run `docker-compose up` to start the `contracts-env` container, and then connect to the container console via `docker-compose exec contracts-env bash`.
The repository uses Docker Compose to manage sensitive keys and load the configuration. Prior to any action like test or deploy, you must run `docker-compose up` to start the `contracts-env` container, and then connect to the container console via `docker-compose exec contracts-env bash`.

Follow the next steps to setup the repository:

- Install `docker` and `docker-compose`
- Create an enviroment file named `.env` and fill the next enviroment variables
- Create an environment file named `.env` and fill the next environment variables

```
# Add Alchemy or Infura provider keys, alchemy takes preference at the config level
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IPool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ interface IPool {
returns (DataTypes.UserConfigurationMap memory);

/**
* @notice Returns the normalized income normalized income of the reserve
* @notice Returns the normalized income of the reserve
* @param asset The address of the underlying asset of the reserve
* @return The reserve's normalized income
*/
Expand Down
4 changes: 2 additions & 2 deletions contracts/protocol/tokenization/AToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ contract AToken is VersionedInitializable, ScaledBalanceTokenBase, EIP712Base, I

/**
* @dev Overrides the base function to fully implement IAToken
* @dev see `IncentivizedERC20.DOMAIN_SEPARATOR()` for more detailed documentation
* @dev see `EIP712Base.DOMAIN_SEPARATOR()` for more detailed documentation
*/
function DOMAIN_SEPARATOR() public view override(IAToken, EIP712Base) returns (bytes32) {
return super.DOMAIN_SEPARATOR();
}

/**
* @dev Overrides the base function to fully implement IAToken
* @dev see `IncentivizedERC20.nonces()` for more detailed documentation
* @dev see `EIP712Base.nonces()` for more detailed documentation
*/
function nonces(address owner) public view override(IAToken, EIP712Base) returns (uint256) {
return super.nonces(owner);
Expand Down

0 comments on commit 3925b24

Please sign in to comment.