73 _黄军政_第五课作业

Lesson3/README.md

@@ -0,0 +1,16 @@
+## 硅谷live以太坊智能合约频道官方地址
+
+### 第三课《智能合约后端优化和产品化》
+
+目录结构
+  <br/>|
+  <br/>|--orgin 课程初始代码
+  <br/>|
+  <br/>|--assignment 课程作业提交代码
+<br/> 
+### 本节知识点
+第3课：智能合约后端优化和产品化
+- 如何通过数据结构优化降低合约执行成本
+- 合约的继承
+- 巧用modifier
+- 以太坊函数库的使用和基本介绍

Lesson3/assignment/README.md

@@ -0,0 +1,14 @@
+## 硅谷live以太坊智能合约 第三课作业
+这里是同学提交作业的目录
+
+### 第三课：课后作业
+- 第一题：完成今天所开发的合约产品化内容，使用Remix调用每一个函数，提交函数调用截图
+- 第二题：增加 changePaymentAddress 函数，更改员工的薪水支付地址，思考一下能否使用modifier整合某个功能
+- 第三题（加分题）：自学C3 Linearization, 求以下 contract Z 的继承线
+- contract O
+- contract A is O
+- contract B is O
+- contract C is O
+- contract K1 is A, B
+- contract K2 is A, C
+- contract Z is K1, K2

Lesson3/assignment/img/函数运行截图

@@ -0,0 +1 @@
+函数运行截图

Lesson3/assignment/yours.sol

@@ -0,0 +1,119 @@
+/*作业请提交在这个目录下*/
+
+/****第一题:
+放在img文件夹
+*/
+
+/****第二题：
+employee可以改Payment地址，Modifier不是必须的。
+function changePaymentAddress(address empolyeeId, address newEmployeeId) onlyOwner employeeExist(empolyeeId) {
+        var employee = employees[empolyeeId];
+        employees[newEmployeeId] = Employee(newEmployeeId, employee.salary, employee.lastPayDay);
+        delete employees[empolyeeId];
+    }
+*/
+
+/*****第三题：
+L(O) := [O]
+L(A) := [A, O]
+L(B) := [B, O]
+L(C) := [C, O]
+L(K1) := [K1, A, B, O]
+L(K2) := [K2, A, C, O]
+L(Z) := [Z, K1, K2, A, B, C, O]
+*/
+
+
+/**
+完整代码
+*/
+pragma solidity ^0.4.14;
+
+contract Payroll {
+    struct Employee {
+        address id;
+        uint salary;
+        uint lastPayDay;
+    }
+
+    uint constant payDuration = 10 seconds;
+    address owner;
+    mapping (address => Employee) public employees;
+    uint totalSalary = 0;
+
+    modifier onlyOwner {
+        require(msg.sender == owner);
+        _;
+    }
+
+    modifier employeeExist(address employeeId){
+        assert(employees[employeeId].id != 0x0);
+        _;
+    }
+
+    modifier employeeNotExist(address employeeId){
+        assert(employees[employeeId].id == 0x0);
+        _;
+    }
+
+    function Payroll() {
+        owner = msg.sender;
+    }
+
+    function _partialPaid(Employee employee) private {
+        uint payment = employee.salary * (now - employee.lastPayDay) / payDuration;
+        employee.id.transfer(payment);
+    }
+
+    function addEmployee(address employeeId, uint salary) onlyOwner employeeNotExist(employeeId) {
+        var employee = employees[employeeId];
+        salary = salary * 1 ether;
+        employees[employeeId] = Employee(employeeId, salary, now);
+        totalSalary += salary;
+    }
+
+    function removeEmployee(address employeeId) onlyOwner employeeExist(employeeId) {
+        var employee = employees[employeeId];
+        _partialPaid(employee);
+        totalSalary -= employee.salary;
+        delete employees[employeeId];
+    }
+
+    function updateEmployee(address employeeId, uint salary) onlyOwner employeeExist(employeeId) {
+        var employee = employees[employeeId];
+        _partialPaid(employee);
+
+        uint oldSalary = employee.salary;
+        uint newSalary = salary * 1 ether;
+        employees[employeeId] = Employee(employeeId, newSalary, now);
+        totalSalary = totalSalary + newSalary - oldSalary;
+    }
+
+    function changePaymentAddress(address empolyeeId, address newEmployeeId) onlyOwner employeeExist(empolyeeId) {
+        var employee = employees[empolyeeId];
+        employees[newEmployeeId] = Employee(newEmployeeId, employee.salary, employee.lastPayDay);
+        delete employees[empolyeeId];
+    }
+
+    function addFund() payable returns (uint){
+        return this.balance;
+    }
+
+    function calculateRunway() returns (uint) {
+        return this.balance / totalSalary;
+    }
+
+    function hasEnoughFund() returns (bool){
+        return calculateRunway() > 0;
+    }
+
+    function getPaid() employeeExist(msg.sender) {
+        var employee = employees[msg.sender];
+
+        uint nextPayDay = employee.lastPayDay + payDuration;
+        assert(nextPayDay < now);
+
+        employee.lastPayDay = nextPayDay;
+        employee.id.transfer(employee.salary);
+    }
+}

Lesson3/orgin/README.md

@@ -0,0 +1,3 @@
+## 硅谷live以太坊智能合约 第三课
+
+这里是每一课的初始代码，有需要的同学可以参考

Lesson4/README.md

@@ -0,0 +1,16 @@
+## 硅谷live以太坊智能合约频道官方地址
+
+### 第四课《使用Truffle架构进行前后端交互，测试，部署》
+
+目录结构
+  <br/>|
+  <br/>|--orgin 课程初始代码
+  <br/>|
+  <br/>|--assignment 课程作业提交代码
+<br/> 
+### 本节知识点
+第4课：使用Truffle架构进行前后端交互，测试，部署
+- 为什么要用Truffle，Truffle的基本概念
+- Truffle 的command line 功能
+- 初始化项目与Truffle项目目录结构
+- 编译部署合约到testrpc

Lesson4/assignment/README.md

@@ -0,0 +1,12 @@
+## 硅谷live以太坊智能合约 第四课作业
+这里是同学提交作业的目录
+
+### 第四课：课后作业
+- 将第三课完成的payroll.sol程序导入truffle工程
+- 在test文件夹中，写出对如下两个函数的单元测试：
+- function addEmployee(address employeeId, uint salary) onlyOwner
+- function removeEmployee(address employeeId) onlyOwner employeeExist(employeeId)
+- 思考一下我们如何能覆盖所有的测试路径，包括函数异常的捕捉
+- (加分题,选作）
+- 写出对以下函数的基于solidity或javascript的单元测试 function getPaid() employeeExist(msg.sender)
+- Hint：思考如何对timestamp进行修改，是否需要对所测试的合约进行修改来达到测试的目的？

Lesson4/assignment/src/README

@@ -0,0 +1 @@
+/*创建代码目录*

Lesson4/assignment/yours.sol

@@ -0,0 +1,142 @@
+/*作业请提交在这个目录下*/
+/******
+题目1:
+完成代码见src目录
+*/
+
+/******
+题目2:
+列举不同的输入参数：异常参数和正常参数；
+使用不同的调用address：需要学习如何切换address
+函数异常用 .catch(function(error) 来捕捉。
+
+基于JS的测试：
+步骤1:修改文件夹migrations下的文件2_deploy_contracts.js
+
+var SimpleStorage = artifacts.require("./SimpleStorage.sol");
+var Payroll = artifacts.require("./Payroll.sol");
+
+module.exports = function(deployer) {
+  deployer.deploy(SimpleStorage);
+  deployer.deploy(Payroll);
+};
+
+步骤2:在test目录下新建payroll.js文件
+
+var Payroll = artifacts.require("./Payroll.sol");
+
+// 测试删除员工接口
+contract("Payroll-removeEmployee", function(accounts) {
+     var removeAddress = 0x1238420F4922DB63eA2392194760348ED4Fe4DEF;
+     it("...Remove Employee removeAddress success.", function() {
+         return Payroll.deployed().then(function(instance) {
+             payrollInstance = instance;
+             return payrollInstance.addEmployee(removeAddress,1);
+        }).then(function() {
+             return payrollInstance.removeEmployee(removeAddress);
+         }).then(function() {
+             return payrollInstance.employeeIsExist.call(removeAddress);
+         }).then(function(isExist) {
+             assert.equal(isExist, false, "Remove Employee removeAddress success.");
+         });
+     });
+
+});
+
+//测试新增员工接口
+contract("Payroll-addEmployee", function(accounts) {
+    var newAddress = 0x1238420F4922DB63eA2392194760348ED4Fe4ABC;
+        it("...Add Employee newAddress success.", function() {
+            return Payroll.deployed().then(function(instance) {
+                payrollInstance = instance;
+                return payrollInstance.addEmployee(newAddress,1,{from: accounts[0]});
+            }).then(function() {
+                return payrollInstance.employeeIsExist.call(newAddress);
+            }).then(function(isExist) {
+                assert.equal(isExist, true, "Add Employee newAddress success.");
+            });
+    });
+});
+
+//测试新增员工异常
+contract("Payroll-addEmployee-catchError", function(accounts) {
+    var newAddress = 0x1238420F4922DB63eA2392194760348ED4Fe4ABC;
+        it("...Add Employee newAddress success.", function() {
+            return Payroll.deployed().then(function(instance) {
+                payrollInstance = instance;
+                return payrollInstance.addEmployee(newAddress,1,{from: accounts[0]});
+            }).then(function() {
+                return payrollInstance.addEmployee(newAddress,2,{from: accounts[0]});
+            }).catch(function(error) {
+                console.log(error.toString());
+                assert(error.toString().includes('invalid'), "addEmployee");
+
+            });
+    });
+});
+
+//测试删除员工异常
+contract("Payroll-removeEmployee-catchError", function(accounts) {
+    var removeAddress = 0x1238420F4922DB63eA2392194760348ED4Fe4DEF;
+    it("...Remove Employee removeAddress success.", function() {
+        return Payroll.deployed().then(function(instance) {
+            return payrollInstance.removeEmployee(removeAddress);
+        }).catch(function(error) {
+            console.log(error.toString());
+            assert(error.toString().includes('invalid'), "removeEmployee");
+        });
+    });
+});
+*/
+
+
+/******
+题目3:
+需要对原来的接口做一定的变化，getPaid（）返回转帐数目，以便和收到数目做对比。
+遗留学习点：如何切换用户地址以及获得某地址下的账目数。
+
+步骤1:修改Payroll.sol下的getPaid函数：
+function getPaid() employeeExist(msg.sender) returns (uint) {
+        var employee = employees[msg.sender];
+
+        uint nextPayDay = employee.lastPayDay + payDuration;
+        assert(nextPayDay < now);
+
+        employee.lastPayDay = nextPayDay;
+        employee.id.transfer(employee.salary);
+        return employee.salary;
+    }
+
+步骤2：在test目录下的payroll.js文件增加：
+contract("Payroll-getPaid-MsgSender", function(accounts) {
+    it("...getPaid success.", function() {
+        return Payroll.deployed().then(function(instance) {
+            payrollInstance = instance;
+            return payrollInstance.addEmployee(accounts[0],1);
+        }).then(function() {
+            setTimeout(function(){
+                return payrollInstance.getPaid();
+            },11000);   
+            }).then(function(getsalary) {
+                console.log(getsalary);
+                assert.equal(getsalary > 0, true, "getPaid success.");
+              });
+    });
+});
+
+contract("Payroll-getPaid-notMsgSender", function(accounts) {
+    it("...getPaid success.", function() {
+        return Payroll.deployed().then(function(instance) {
+            payrollInstance = instance;
+            return payrollInstance.addEmployee(accounts[1],1);
+        }).then(function() {
+            setTimeout(function(){
+                return payrollInstance.getPaid();
+            },11000);   
+            }).then(function(getsalary) {
+                assert.equal(getsalary > 0, true, "getPaid success.");
+              });
+    });
+});
+*／
+

Lesson4/orgin/README.md

@@ -0,0 +1,3 @@
+## 硅谷live以太坊智能合约 第四课
+
+这里是每一课的初始代码，有需要的同学可以参考

Lesson4/orgin/payroll.sol

@@ -0,0 +1 @@
+

Lesson5/README.md

@@ -0,0 +1,13 @@
+## 硅谷live以太坊智能合约频道官方地址
+
+### 第五课
+
+目录结构
+  <br/>|
+  <br/>|--orgin 课程初始代码
+  <br/>|
+  <br/>|--assignment 课程作业提交代码
+<br/> 
+
+### 本节知识点
+

Lesson5/assignment/README.md

@@ -0,0 +1,2 @@
+## 硅谷live以太坊智能合约 第五课作业
+这里是同学提交作业的目录

Lesson5/assignment/yours.sol

@@ -0,0 +1 @@
+/*作业请提交在这个目录下*/