Delete Context from DiamodERC20 (#60)

* Deleted Context

* Updated versions

Author: KyrylR

contracts/diamond/tokens/ERC20/DiamondERC20.sol

@@ -29,9 +29,7 @@ contract DiamondERC20 is DiamondERC20Storage {
      * @inheritdoc IERC20
      */
     function transfer(address to_, uint256 amount_) public virtual override returns (bool) {
-        address owner_ = _msgSender();
-
-        _transfer(owner_, to_, amount_);
+        _transfer(msg.sender, to_, amount_);
 
         return true;
     }
@@ -40,9 +38,7 @@ contract DiamondERC20 is DiamondERC20Storage {
      * @inheritdoc IERC20
      */
     function approve(address spender_, uint256 amount_) public virtual override returns (bool) {
-        address owner_ = _msgSender();
-
-        _approve(owner_, spender_, amount_);
+        _approve(msg.sender, spender_, amount_);
 
         return true;
     }
@@ -55,9 +51,7 @@ contract DiamondERC20 is DiamondERC20Storage {
         address to_,
         uint256 amount_
     ) public virtual override returns (bool) {
-        address spender_ = _msgSender();
-
-        _spendAllowance(from_, spender_, amount_);
+        _spendAllowance(from_, msg.sender, amount_);
         _transfer(from_, to_, amount_);
 
         return true;
@@ -70,7 +64,7 @@ contract DiamondERC20 is DiamondERC20Storage {
         address spender_,
         uint256 addedValue_
     ) public virtual returns (bool) {
-        address owner_ = _msgSender();
+        address owner_ = msg.sender;
 
         _approve(owner_, spender_, allowance(owner_, spender_) + addedValue_);
 
@@ -84,7 +78,7 @@ contract DiamondERC20 is DiamondERC20Storage {
         address spender_,
         uint256 subtractedValue_
     ) public virtual returns (bool) {
-        address owner_ = _msgSender();
+        address owner_ = msg.sender;
         uint256 currentAllowance_ = allowance(owner_, spender_);
 
         require(currentAllowance_ >= subtractedValue_, "ERC20: decreased allowance below zero");

contracts/diamond/tokens/ERC20/DiamondERC20Storage.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
@@ -10,7 +9,7 @@ import {InitializableStorage} from "../../utils/InitializableStorage.sol";
 /**
  * @notice This is an ERC20 token Storage contract with Diamond Standard support
  */
-abstract contract DiamondERC20Storage is InitializableStorage, Context, IERC20, IERC20Metadata {
+abstract contract DiamondERC20Storage is InitializableStorage, IERC20, IERC20Metadata {
     bytes32 public constant DIAMOND_ERC20_STORAGE_SLOT =
         keccak256("diamond.standard.diamond.erc20.storage");
 

contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dlsl/dev-modules",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "license": "MIT",
   "author": "Distributed Lab",
   "readme": "README.md",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dlsl",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "license": "MIT",
   "author": "Distributed Lab",
   "description": "Solidity Development Modules by Distributed Lab",