fixed and renamed ERC20Initializable

windingtree · Feb 4, 2021 · 0fbe027 · 0fbe027
1 parent 99cc6b5
commit 0fbe027
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/contracts/ERC20/ERC20Upgradeable.sol → contracts/ERC20/ERC20Initializable.sol b/contracts/ERC20/ERC20Upgradeable.sol → contracts/ERC20/ERC20Initializable.sol
@@ -2,23 +2,21 @@
 
 pragma solidity ^0.6.0;
 
-import "@openzeppelin/upgrades-core/contracts/Initializable.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 
 /**
  * @dev Easy configurable and upgradeable token
  */
-contract ERC20Upgradeable is Initializable, ERC20 {
+contract ERC20Initializable is ERC20Upgradeable {
 
     /// @dev Token constructor
-    initialize(
+    function initialize(
       string memory name,
       string memory symbol,
       uint8 decimals,
       uint256 supply
     ) public initializer {
-        _name = name;
-        _symbol = symbol;
+        __ERC20_init(name, symbol);
         _setupDecimals(decimals);
         _mint(msg.sender, supply);
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@windingtree/smart-contracts-libraries",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Libraries and utilities for smart contracts",
   "publishConfig": {
     "access": "public"
@@ -28,13 +28,14 @@
   },
   "homepage": "https://github.com/windingtree/smart-contracts-libraries#readme",
   "dependencies": {
-    "@openzeppelin/contracts": "3.3.0",
+    "@openzeppelin/contracts": "3.4.0",
+    "@openzeppelin/contracts-upgradeable": "3.4.0",
     "@openzeppelin/upgrades-core": "1.5.0"
   },
   "devDependencies": {
     "solc": "0.8.1",
     "solhint": "3.3.2",
-    "truffle": "5.1.63",
+    "truffle": "5.1.64",
     "@truffle/hdwallet-provider": "1.2.1"
   }
 }