Skip to content

Remove duplicate import of the context contract #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artob merged 2 commits into from
Jun 21, 2021
Merged

Remove duplicate import of the context contract #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
721a5be
remove context contract
0x3bfc Jun 21, 2021
0050616
follow openzepplin msgSender() style
0x3bfc Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions etc/eth-contracts/contracts/EvmErc20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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) {
Expand All @@ -29,7 +28,7 @@ contract EvmErc20 is Context, 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);
Expand All @@ -41,7 +40,7 @@ contract EvmErc20 is Context, 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);
Expand Down