Skip to content

[DO NOT merge] intermediate version: transferFrom() without return value #92

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

Open
taokayan wants to merge 1 commit into
base: release/1.0
Choose a base branch
from
Open

[DO NOT merge] intermediate version: transferFrom() without return value #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions solidity_contracts/erc20/evm2native.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ interface IERC20 {
function allowance(address owner, address spender) external view returns (uint);
function approve(address spender, uint value) external returns (bool);
function transfer(address to, uint value) external returns (bool);
function transferFrom(address from, address to, uint value) external returns (bool);
function transferFrom(address from, address to, uint value) external;
}

contract Evm2Native is Initializable, UUPSUpgradeable {
Expand Down Expand Up @@ -1002,9 +1002,7 @@ contract Evm2Native is Initializable, UUPSUpgradeable {
require(_isReservedAddress(to), "to address must be reserved address");
require(amount > 0, "amount too small");

if (!token.transferFrom(msg.sender, address(this), amount)) {
revert();
}
token.transferFrom(msg.sender, address(this), amount);

// Call bridgeMessage of EVM Runtime
// sha("bridgeTransferV0(address,uint256,string)") = 0x653332e5
Expand Down