From c0f01cc85e86bff8ecfc96bebd3d42374dbc2564 Mon Sep 17 00:00:00 2001
From: owen05 <liuhongnan53@163.com>
Date: Wed, 30 Jun 2021 21:07:08 +0800
Subject: [PATCH] fix decimals

---
 config/kovan-config.js                           |  8 ++++----
 config/rinkeby-config.js                         |  6 +++---
 contracts/Factory/ERC20Factory.sol               |  4 ++--
 contracts/Factory/ERC20V2Factory.sol             |  4 ++--
 contracts/external/ERC20/InitializableERC20.sol  |  4 ++--
 .../ERC20/InitializableMintableERC20.sol         |  4 ++--
 deploy-detail-periphery.txt                      | 16 ++++++++++++++++
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/config/kovan-config.js b/config/kovan-config.js
index 0b4810f..0035b3a 100644
--- a/config/kovan-config.js
+++ b/config/kovan-config.js
@@ -20,9 +20,9 @@ module.exports = {
         DSP: "0xAD4E649c1771F5175081c2CcAC183fDb91cfCd6c",
         DPPAdmin: "0xf63e41A459D9AEcaE4bAE1278ef0ae84F7F2DE56",
         CP: "0x6092eFEf82CaDcd07f3a545cBe6C83dae713aE0A",
-        ERC20: "0x77d2e257241e6971688b08bda9f658f065d7bb41",
-        MintableERC20: "0xa45a64daba80757432fa4d654df12f65f020c13c",
-        CustomERC20: "0x3a0e0F2EDFC0e96BD700815f953Bcb6d8a6FF0AB",
+        ERC20: "0x4DdcDcCe3BCDD84c8E15d50Bd9384c25B3Ca9eff",
+        MintableERC20: "",
+        CustomERC20: "0xFC8fb4CD3A77F138E53F92F5EC483e9887508CCe",
 
         //Factory
         DVMFactory: "0x322F8014C125Da09314d3a68d4d9F427823F17FD",
@@ -31,7 +31,7 @@ module.exports = {
         CrowdPoolingFactory: "0x9e6E8985D52E91eDf1671f28Ca73bc4F3E219b72",
         UpCpFactory: "0x25AE560522165eacCFbF2287493AF12B8ad718e7",
         ERC20Factory: "0xCb1A2f64EfB02803276BFB5a8D511C4D950282a0",
-        ERC20V2Factory: "0xce4Bdc3151bF9F9dcADAED961a65D32f7bAC5460",
+        ERC20V2Factory: "0xa2c1eA946dA567248c70F792b64D5F2551f29204",
 
         //Approve
         DODOApprove: "0xa375b128e139ae54EF7F189BC8fEb4624f1c2Afa",
diff --git a/config/rinkeby-config.js b/config/rinkeby-config.js
index 081b096..8557e68 100644
--- a/config/rinkeby-config.js
+++ b/config/rinkeby-config.js
@@ -20,8 +20,8 @@ module.exports = {
         DSP: "0xe2C23cBF03930418BF97e173FE3E950aD29fdb06",
         DPPAdmin: "0x2FF619B4Cfe36b0F92dD933256B1581a3269a5F4",
         CP: "0x6850eE8cF963B913a8eC3610B5f128C3100178E5",
-        ERC20: "0x80Dd80AF76D82c1962DdFb7d69C6Fdca2AAEEF00",
-        MintableERC20: "0x595D13871de67Ae33b452e6ef59Aa18d23634FdE",
+        ERC20: "0x7119D1Ec8235bd0a82289fDb1cCAa4bD4D1e0605",
+        MintableERC20: "",
         CustomERC20: "0x0Cd57DC8367362314C510446FD106B66989Eb81a",
 
         //Factory
@@ -31,7 +31,7 @@ module.exports = {
         CrowdPoolingFactory: "0xDD43520779dDCfbDe373174Ee36aEaD39771cD4f",
         UpCpFactory: "0xb09E91505347234Cb722D67042290f50F1C13749",
         ERC20Factory: "0x48476599281CB7DD46dbE47264C4594d1d2E19A8",
-        ERC20V2Factory: "0x6659fB6fc609e8c5159Aaccb80e49cCB8F64442a",
+        ERC20V2Factory: "0x7A22e361cB74E69B5B1C800A3aAbE3E50e84F4F6",
 
         //Approve
         DODOApprove: "0xcC8d87A7C747eeE4242045C47Ef25e0A81D56ae3",
diff --git a/contracts/Factory/ERC20Factory.sol b/contracts/Factory/ERC20Factory.sol
index 60a2fe9..1b026ff 100644
--- a/contracts/Factory/ERC20Factory.sol
+++ b/contracts/Factory/ERC20Factory.sol
@@ -50,7 +50,7 @@ contract ERC20Factory {
         uint256 totalSupply,
         string memory name,
         string memory symbol,
-        uint256 decimals
+        uint8 decimals
     ) external returns (address newERC20) {
         newERC20 = ICloneFactory(_CLONE_FACTORY_).clone(_ERC20_TEMPLATE_);
         InitializableERC20(newERC20).init(msg.sender, totalSupply, name, symbol, decimals);
@@ -62,7 +62,7 @@ contract ERC20Factory {
         uint256 initSupply,
         string memory name,
         string memory symbol,
-        uint256 decimals
+        uint8 decimals
     ) external returns (address newMintableERC20) {
         newMintableERC20 = ICloneFactory(_CLONE_FACTORY_).clone(_MINTABLE_ERC20_TEMPLATE_);
         InitializableMintableERC20(newMintableERC20).init(
diff --git a/contracts/Factory/ERC20V2Factory.sol b/contracts/Factory/ERC20V2Factory.sol
index ca4a843..d160f8b 100644
--- a/contracts/Factory/ERC20V2Factory.sol
+++ b/contracts/Factory/ERC20V2Factory.sol
@@ -17,7 +17,7 @@ interface IStdERC20 {
         uint256 _totalSupply,
         string memory _name,
         string memory _symbol,
-        uint256 _decimals
+        uint8 _decimals
     ) external;
 }
 
@@ -27,7 +27,7 @@ interface ICustomERC20 {
         uint256 _initSupply,
         string memory _name,
         string memory _symbol,
-        uint256 _decimals,
+        uint8 _decimals,
         uint256 _tradeBurnRatio,
         uint256 _tradeFeeRatio,
         address _team,
diff --git a/contracts/external/ERC20/InitializableERC20.sol b/contracts/external/ERC20/InitializableERC20.sol
index 80bd230..d08e578 100644
--- a/contracts/external/ERC20/InitializableERC20.sol
+++ b/contracts/external/ERC20/InitializableERC20.sol
@@ -13,7 +13,7 @@ contract InitializableERC20 {
     using SafeMath for uint256;
 
     string public name;
-    uint256 public decimals;
+    uint8 public decimals;
     string public symbol;
     uint256 public totalSupply;
 
@@ -30,7 +30,7 @@ contract InitializableERC20 {
         uint256 _totalSupply,
         string memory _name,
         string memory _symbol,
-        uint256 _decimals
+        uint8 _decimals
     ) public {
         require(!initialized, "TOKEN_INITIALIZED");
         initialized = true;
diff --git a/contracts/external/ERC20/InitializableMintableERC20.sol b/contracts/external/ERC20/InitializableMintableERC20.sol
index a6e7c34..5a1df92 100644
--- a/contracts/external/ERC20/InitializableMintableERC20.sol
+++ b/contracts/external/ERC20/InitializableMintableERC20.sol
@@ -14,7 +14,7 @@ contract InitializableMintableERC20 is InitializableOwnable {
     using SafeMath for uint256;
 
     string public name;
-    uint256 public decimals;
+    uint8 public decimals;
     string public symbol;
     uint256 public totalSupply;
 
@@ -31,7 +31,7 @@ contract InitializableMintableERC20 is InitializableOwnable {
         uint256 _initSupply,
         string memory _name,
         string memory _symbol,
-        uint256 _decimals
+        uint8 _decimals
     ) public {
         initOwner(_creator);
         name = _name;
diff --git a/deploy-detail-periphery.txt b/deploy-detail-periphery.txt
index af555bb..f5c86be 100644
--- a/deploy-detail-periphery.txt
+++ b/deploy-detail-periphery.txt
@@ -515,3 +515,19 @@ Deploy type: ERC20V2Factory
 CustomERC20Address:  0x3a0e0F2EDFC0e96BD700815f953Bcb6d8a6FF0AB
 ERC20V2FactoryAddress:  0xce4Bdc3151bF9F9dcADAED961a65D32f7bAC5460
 Init ERC20V2Factory Tx: 0x5c03786d3e12b5c9532429f83c548a892c2d1ec613a44db81a9595e3bf017490
+====================================================
+network type: kovan
+Deploy time: 2021/6/30 下午4:16:43
+Deploy type: ERC20V2Factory
+ERC20Address:  0x4DdcDcCe3BCDD84c8E15d50Bd9384c25B3Ca9eff
+CustomERC20Address:  0xFC8fb4CD3A77F138E53F92F5EC483e9887508CCe
+ERC20V2FactoryAddress:  0xa2c1eA946dA567248c70F792b64D5F2551f29204
+Init ERC20V2Factory Tx: 0xea9b31add78c4d926733697abec3051133ad0a13dee7c8ef02938f675e4e9dbd
+====================================================
+network type: rinkeby
+Deploy time: 2021/6/30 下午4:19:52
+Deploy type: ERC20V2Factory
+====================================================
+network type: rinkeby
+Deploy time: 2021/6/30 下午4:32:54
+Deploy type: ERC20V2Factory