NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GSN compatibility (#1880)

Browse Source 
* switch to using Context internally

* add context import

* Add smoke test to make sure enabling GSN support works

* Update test/GSN/ERC721GSNRecipientMock.test.js

Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>

* Upgrade truffle

* add missing awaits

* Revert "Upgrade truffle"

This reverts commit f9b0ba9019.
This commit is contained in:
Nicolás Venturo
2019-08-14 09:21:38 -03:00
committed by Francisco Giordano
parent 4070719ff5
commit 89835152ce
55 changed files with 298 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/examples/SimpleToken.sol
View File

@ -1,6 +1,8 @@
pragma solidity ^0.5.2;
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../GSN/Context.sol";
import "../token/ERC20/ERC20.sol";
import "../token/ERC20/ERC20Detailed.sol";
@ -10,16 +12,14 @@ import "../token/ERC20/ERC20Detailed.sol";
* Note they can later distribute these tokens as they wish using `transfer` and other
* `ERC20` functions.
*/
contract SimpleToken is Initializable, ERC20, ERC20Detailed {
uint8 public constant DECIMALS = 18;
uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(DECIMALS));
contract SimpleToken is Initializable, Context, ERC20, ERC20Detailed {
/**
* @dev Constructor that gives msg.sender all of existing tokens.
* @dev Constructor that gives _msgSender() all of existing tokens.
*/
function initialize(address sender) public initializer {
ERC20Detailed.initialize("SimpleToken", "SIM", DECIMALS);
_mint(sender, INITIAL_SUPPLY);
ERC20Detailed.initialize("SimpleToken", "SIM", 18);
_mint(sender, 10000 * (10 ** uint256(decimals())));
}
uint256[50] private ______gap;