Merge upstream master into patched/master

07ab7e44 · github-actions · 14a027eb · be3c5ca5 · 07ab7e44 · 07ab7e44
Commit 07ab7e44 authored Feb 13, 2022 by github-actions
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ERC20.sol contracts/token/ERC20/ERC20.sol +1 -1

ERC777.sol contracts/token/ERC777/ERC777.sol +1 -1

No files found.
--- a/contracts/token/ERC20/ERC20.sol
+++ b/contracts/token/ERC20/ERC20.sol
@@ -320,7 +320,7 @@ contract ERC20 is Context, IERC20, IERC20Metadata {
    }

    /**
-     * @dev Spend `amount` form the allowance of `owner` toward `spender`.
+     * @dev Updates `owner` s allowance for `spender` based on spent `amount`.
     *
     * Does not update the allowance amount in case of infinite allowance.
     * Revert if not enough allowance is available.

--- a/contracts/token/ERC777/ERC777.sol
+++ b/contracts/token/ERC777/ERC777.sol
@@ -502,7 +502,7 @@ contract ERC777 is Context, IERC777, IERC20 {
    }

    /**
-     * @dev Spend `amount` form the allowance of `owner` toward `spender`.
+     * @dev Updates `owner` s allowance for `spender` based on spent `amount`.
     *
     * Does not update the allowance amount in case of infinite allowance.
     * Revert if not enough allowance is available.