fix test code for 23-erc865-and-erc875

Author: jolycao

README.md

@@ -75,9 +75,9 @@
 19. [brownie](basic/19-brownie/README.md)
 20. [scaffold-flash-loan &  dex arbitrage](basic/20-scaffold-flash-loan/readme.md)
 21. [scaffold-Lender](basic/21-scaffold-lender/README.md)
-22. [CryptoKitties](https://zhuanlan.zhihu.com/p/34690916)
+22. [scaffold-zk](basic/22-scaffold-zk/readme.md)
 23. [ERC865 & ERC875](basic/23-erc865-and-erc875/README.md)
-24. [scaffold-zk](basic/22-scaffold-zk/readme.md)
+24. [CryptoKitties](https://zhuanlan.zhihu.com/p/34690916)
 25. [multi-sig-wallet](basic/25-multi-sig-wallet/readme.md)
 26. [snapshot](https://www.chainnews.com/articles/038258049958.htm)
 27. [Quadratic vote](basic/27-quadratic-vote/README.md)

basic/23-erc865-and-erc875/.env.example

@@ -0,0 +1 @@
+PRIVATE_KEY=xxxxxxxxxxxxxxxx

basic/23-erc865-and-erc875/README.md

@@ -1,15 +1,27 @@
-## ERC865
+## 概要  
+### ERC865 
+通过 test_DToken.js 介绍了如何使用“无Gas”交易，阐明了“无Gas”实际上意味着将Gas成本转移给其他人。 
+使用此模式有很多好处，因此，它被广泛使用. 签名允许将交易 gas 成本从用户转移到服务提供商, 从而在许多情况下消除了相当大的障碍. 它还允许实现更高级的委派模式, 通常会对UX进行相当大的改进  
 
-  代理合约，转账无需gas费，离线发送代理方上链
-   
-## ERC875
-   支持原子交易的token
-   
-## EIP712
-签名协议
+### ERC875
+支持原子交易的token  
+
+### EIP712  
+通过签名功能函数的好处是用户可以免费完成委托或投票交易, 同时会有可信的第三方花费gas费用将投票结果写到区块链中. 在本次教程中，我们重点展示这类函数的例子. 
+
+## 测试步骤 
+- 安装依赖 
+```
+yarn
+```
+
+- 测试代理合约 
+```
+npx hardhat test test/test_DToken.js 
+``` 
 
 ## 参考链接
-https://github.com/propsproject/props-token-distribution
-EIP712 ：https://learnblockchain.cn/article/1357  
-https://learnblockchain.cn/2019/04/24/token-EIP712
-https://learnblockchain.cn/article/1496
+https://github.com/propsproject/props-token-distribution 
+https://learnblockchain.cn/article/1357    
+https://learnblockchain.cn/2019/04/24/token-EIP712  
+https://learnblockchain.cn/article/1496  

basic/23-erc865-and-erc875/contracts/ERC865Token.sol

@@ -73,7 +73,7 @@ contract ERC865Token is Initializable, ERC20, IERC865 {
         require(_spender != address(0),"Invalid _spender address");
 
         bytes32 hashedParams = getApprovePreSignedHash(address(this), _spender, _value, _fee, _nonce);
-        address from = ECDSA.recover(hashedParams, _signature);
+        address from = ECDSA.recover(ECDSA.toEthSignedMessageHash(hashedParams), _signature);
         require(from != address(0),"Invalid from address recovered");
         bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
         require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
@@ -107,7 +107,7 @@ contract ERC865Token is Initializable, ERC20, IERC865 {
         require(_spender != address(0),"Invalid _spender address");
 
         bytes32 hashedParams = getIncreaseAllowancePreSignedHash(address(this), _spender, _addedValue, _fee, _nonce);
-        address from = ECDSA.recover(hashedParams, _signature);
+        address from = ECDSA.recover(ECDSA.toEthSignedMessageHash(hashedParams), _signature);
         require(from != address(0),"Invalid from address recovered");
         bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
         require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
@@ -141,7 +141,7 @@ contract ERC865Token is Initializable, ERC20, IERC865 {
         require(_spender != address(0),"Invalid _spender address");
 
         bytes32 hashedParams = getDecreaseAllowancePreSignedHash(address(this), _spender, _subtractedValue, _fee, _nonce);
-        address from = ECDSA.recover(hashedParams, _signature);
+        address from = ECDSA.recover(ECDSA.toEthSignedMessageHash(hashedParams), _signature);
         require(from != address(0),"Invalid from address recovered");
         bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
         require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
@@ -179,7 +179,7 @@ contract ERC865Token is Initializable, ERC20, IERC865 {
 
         bytes32 hashedParams = getTransferFromPreSignedHash(address(this), _from, _to, _value, _fee, _nonce);
 
-        address spender = ECDSA.recover(hashedParams, _signature);
+        address spender = ECDSA.recover(ECDSA.toEthSignedMessageHash(hashedParams), _signature);
         require(spender != address(0),"Invalid spender address recovered");
         bytes32 hashedTx = keccak256(abi.encodePacked(spender, hashedParams));
         require(hashedTxs[hashedTx] == false,"Transaction hash was already used");

basic/23-erc865-and-erc875/hardhat.config.js

@@ -1,4 +1,7 @@
 require("@nomiclabs/hardhat-waffle");
+const fs = require("fs");
+require('dotenv').config()
+
 
 // This is a sample Hardhat task. To learn how to create your own go to
 // https://hardhat.org/guides/create-task.html
@@ -10,13 +13,49 @@ task("accounts", "Prints the list of accounts", async () => {
   }
 });
 
-// You need to export an object to set up your config
-// Go to https://hardhat.org/config/ to learn more
+function mnemonic() {
+
+ return process.env.PRIVATE_KEY;
+
+}
 
 /**
  * @type import('hardhat/config').HardhatUserConfig
  */
 module.exports = {
   solidity: "0.4.25",
-};
-
+  networks: {
+    localhost: {
+      url: "http://localhost:8545",
+      //gasPrice: 125000000000,//you can adjust gasPrice locally to see how much it will cost on production
+      /*
+        notice no mnemonic here? it will just use account 0 of the hardhat node to deploy
+        (you can put in a mnemonic here to set the deployer locally)
+      */
+    },
+    rinkeby: {
+      url: "https://rinkeby.infura.io/v3/0aae8358bfe04803b8e75bb4755eaf07", //<---- YOUR INFURA ID! (or it won't work)
+      accounts: [
+      mnemonic()
+      ],
+    },
+    kovan: {
+      url: "https://kovan.infura.io/v3/0aae8358bfe04803b8e75bb4755eaf07", //<---- YOUR INFURA ID! (or it won't work)
+      accounts: [
+        mnemonic()
+      ],
+    },
+    mainnet: {
+      url: "https://mainnet.infura.io/v3/0aae8358bfe04803b8e75bb4755eaf07", //<---- YOUR INFURA ID! (or it won't work)
+      accounts: [
+        mnemonic()
+      ],
+    },
+    ropsten: {
+      url: "https://ropsten.infura.io/v3/0aae8358bfe04803b8e75bb4755eaf07", //<---- YOUR INFURA ID! (or it won't work)
+      accounts: [
+        mnemonic()
+      ],
+    },
+  }
+};

basic/23-erc865-and-erc875/package.json

@@ -3,11 +3,14 @@
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "bignumber.js": "^8.0.2",
     "chai": "^4.3.4",
     "ethereum-waffle": "^3.3.0",
+    "ethereumjs-util": "^5.1.3",
     "ethers": "^5.3.1",
-    "hardhat": "^2.3.3",
-    "bignumber.js": "^8.0.2",
-    "ethereumjs-util": "^5.1.3"
+    "hardhat": "^2.3.3"
+  },
+  "dependencies": {
+    "dotenv": "^10.0.0"
   }
 }