From 721a5be6f7a4b29a3fb121d646149aa1c6dc67fd Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Mon, 21 Jun 2021 17:04:52 +0200 Subject: [PATCH 1/2] remove context contract --- etc/eth-contracts/contracts/EvmErc20.sol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/eth-contracts/contracts/EvmErc20.sol b/etc/eth-contracts/contracts/EvmErc20.sol index c9759c4e3..d91cb2184 100644 --- a/etc/eth-contracts/contracts/EvmErc20.sol +++ b/etc/eth-contracts/contracts/EvmErc20.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: CC0-1.0 pragma solidity ^0.8.0; -import "@openzeppelin/contracts/utils/Context.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "./AdminControlled.sol"; import "./IExit.sol"; @@ -13,7 +12,7 @@ import "./IExit.sol"; * Note they can later distribute these tokens as they wish using `transfer` and other * `ERC20` functions. */ -contract EvmErc20 is Context, ERC20, AdminControlled, IExit { +contract EvmErc20 is ERC20, AdminControlled, IExit { uint8 private _decimals; constructor (string memory name, string memory symbol, uint8 decimal, address admin) ERC20(name, symbol) AdminControlled(admin, 0) { From 00506164f496701ac446f8197d3d7382501dddb7 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Mon, 21 Jun 2021 17:07:24 +0200 Subject: [PATCH 2/2] follow openzepplin msgSender() style --- etc/eth-contracts/contracts/EvmErc20.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/eth-contracts/contracts/EvmErc20.sol b/etc/eth-contracts/contracts/EvmErc20.sol index d91cb2184..83059cc06 100644 --- a/etc/eth-contracts/contracts/EvmErc20.sol +++ b/etc/eth-contracts/contracts/EvmErc20.sol @@ -28,7 +28,7 @@ contract EvmErc20 is ERC20, AdminControlled, IExit { } function withdrawToNear(bytes memory recipient, uint256 amount) external override { - _burn(msg.sender, amount); + _burn(_msgSender(), amount); bytes32 amount_b = bytes32(amount); bytes memory input = abi.encodePacked("\x01", amount_b, recipient); @@ -40,7 +40,7 @@ contract EvmErc20 is ERC20, AdminControlled, IExit { } function withdrawToEthereum(address recipient, uint256 amount) external override { - _burn(msg.sender, amount); + _burn(_msgSender(), amount); bytes32 amount_b = bytes32(amount); bytes20 recipient_b = bytes20(recipient);