86_李奇楠_第六课作业

.gitignore

@@ -0,0 +1,26 @@
+.idea/vcs.xml
+.idea/workspace.xml
+Lesson-4/assignment/payroll/payroll.iml
+Lesson-4/assignment/payroll/.idea/misc.xml
+Lesson-4/assignment/payroll/.idea/modules.xml
+Lesson-4/assignment/payroll/.idea/workspace.xml
+Lesson-5/orgin/orgin.iml
+Lesson-5/orgin/package-lock.json
+Lesson-5/orgin/.idea/misc.xml
+Lesson-5/orgin/.idea/modules.xml
+Lesson-5/orgin/.idea/workspace.xml
+Lesson-5/assignment/payroll/orgin.iml
+Lesson-5/assignment/payroll/package-lock.json
+Lesson-5/assignment/payroll/.idea/misc.xml
+Lesson-5/assignment/payroll/.idea/modules.xml
+Lesson-5/assignment/payroll/.idea/workspace.xml
+Lesson-6/orgin/orgin.iml
+Lesson-6/orgin/package-lock.json
+Lesson-6/orgin/.idea/misc.xml
+Lesson-6/orgin/.idea/modules.xml
+Lesson-6/orgin/.idea/workspace.xml
+Lesson-6/assignment/payroll/orgin.iml
+Lesson-6/assignment/payroll/package-lock.json
+Lesson-6/assignment/payroll/.idea/misc.xml
+Lesson-6/assignment/payroll/.idea/modules.xml
+Lesson-6/assignment/payroll/.idea/workspace.xml

Lesson-1/assignment/yours.sol

@@ -1 +1,51 @@
 /*作业请提交在这个目录下*/
+pragma solidity ^0.4.14;
+
+contract Payroll {
+    uint constant payDuration = 10 seconds;
+
+    address owner;
+    uint salary;
+    address employee;
+    uint lastPayday;
+
+    function Payroll() {
+        owner = msg.sender;
+    }
+
+    function updateEmployeeAddress(address e) {
+        require(msg.sender == owner);
+
+        employee = e;
+        lastPayday = now;
+    }
+
+    function updateEmployeeSalary(uint s) {
+        require(msg.sender == owner);
+
+        salary = s * 1 ether;
+        lastPayday = now;
+    }
+
+    function addFund() payable returns (uint) {
+        return this.balance;
+    }
+
+    function calculateRunway() returns (uint) {
+        return this.balance / salary;
+    }
+
+    function hasEnoughFund() returns (bool) {
+        return calculateRunway() > 0;
+    }
+
+    function getPaid() {
+        require(msg.sender == employee);
+
+        uint nextPayday = lastPayday + payDuration;
+        assert(nextPayday < now);
+
+        lastPayday = nextPayday;
+        employee.transfer(salary);
+    }
+}

Lesson-2/README.md

@@ -0,0 +1,16 @@
+## 硅谷live以太坊智能合约频道官方地址
+
+### 第二课《智能合约设计进阶-多员工薪酬系统》
+
+目录结构
+  <br/>|
+  <br/>|--orgin 课程初始代码
+  <br/>|
+  <br/>|--assignment 课程作业提交代码
+<br/> 
+### 本节知识点
+第2课：智能合约设计进阶-多员工薪酬系统
+- 动态静态数组的不同
+- 函数输入参数检查 revert
+- 循环与遍历的安全性
+- 程序运行错误检查和容错：assert与require

Lesson-2/assignment/Gas Usage Record.txt

@@ -0,0 +1,29 @@
+| Version 1 |                  |                |
+|-----------|------------------|----------------|
+| Employee  | transaction cost | execution cost |
+|-----------|------------------|----------------|
+| 1         | 22971            | 1699           |
+| 2         | 23759            | 2487           |
+| 3         | 24547            | 3275           |
+| 4         | 25335            | 4063           |
+| 5         | 26123            | 4851           |
+| 6         | 26911            | 5639           |
+| 7         | 27699            | 6427           |
+| 8         | 28487            | 7215           |
+| 9         | 29275            | 8003           |
+| 10        | 30063            | 8791           |
+
+| Version 2 |                  |                |
+|-----------|------------------|----------------|
+| Employee  | transaction cost | execution cost |
+|-----------|------------------|----------------|
+| 1         | 22122            | 850            |
+| 2         | 22122            | 850            |
+| 3         | 22122            | 850            |
+| 4         | 22122            | 850            |
+| 5         | 22122            | 850            |
+| 6         | 22122            | 850            |
+| 7         | 22122            | 850            |
+| 8         | 22122            | 850            |
+| 9         | 22122            | 850            |
+| 10        | 22122            | 850            |

Lesson-2/assignment/README.md

@@ -0,0 +1,10 @@
+## 硅谷live以太坊智能合约 第二课作业
+这里是同学提交作业的目录
+
+### 第二课：课后作业
+完成今天的智能合约添加100ETH到合约中
+- 加入十个员工，每个员工的薪水都是1ETH
+每次加入一个员工后调用calculateRunway这个函数，并且记录消耗的gas是多少？Gas变化么？如果有 为什么？
+- 如何优化calculateRunway这个函数来减少gas的消耗？
+提交：智能合约代码，gas变化的记录，calculateRunway函数的优化
+

Lesson-2/assignment/yours.sol

@@ -0,0 +1,125 @@
+pragma solidity ^0.4.14;
+
+contract Payroll {
+    struct Employee {
+        address id;
+        uint salary;
+        uint lastPayday;
+    }
+
+    uint constant payDuration = 10 seconds;
+
+    address owner;
+    Employee[] employees;
+    uint totalSalary;
+
+    function Payroll() {
+        owner = msg.sender;
+    }
+
+    function _partialPaid(Employee employee) private {
+      if (employee.id != 0x0) {
+          uint payment = employee.salary * (now - employee.lastPayday) / payDuration;
+          employee.id.transfer(payment);
+      }
+    }
+
+    function _findEmployee(address e) private constant returns (Employee, uint) {
+      for(uint i = 0; i < employees.length; i++) {
+          if(employees[i].id == e) {
+              return (employees[i], i);
+          }
+      }
+    }
+
+    //For debug only
+    function getAllEmployees() returns (address[], uint[], uint[]){
+      require(msg.sender == owner);
+      address[] memory addrs = new address[](employees.length);
+      uint[]    memory salays = new uint[](employees.length);
+      uint[]    memory lastpds = new uint[](employees.length);
+      for (uint i = 0; i < employees.length; i++) {
+          Employee storage employee = employees[i];
+          addrs[i] = employee.id;
+          salays[i] = employee.salary;
+          lastpds[i] = employee.lastPayday;
+      }
+      return (addrs, salays, lastpds);
+    }
+    //For debug only
+    function getBalance() constant returns (uint){
+      require(msg.sender == owner);
+      return this.balance;
+    }
+    //For debug only
+    function getTotalSalary() constant returns (uint){
+      require(msg.sender == owner);
+      return totalSalary;
+    }
+
+
+    function addEmployee(address e, uint s) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id == 0x00);
+      employees.push(Employee(e, s * 1 ether, now));
+
+      totalSalary += s * 1 ether;
+    }
+
+    function removeEmployee(address e) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id != 0x00);
+      delete employees[index];
+      employees[index] = employees[employees.length-1];
+      employees.length--;
+
+      totalSalary -= employee.salary;
+
+      _partialPaid(employee);
+    }
+
+    function updateEmployee(address e, uint s) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id != 0x00);
+
+      uint delta_salary = employee.salary - s * 1 ether;
+
+      employees[index].id = e;
+      employees[index].salary = s * 1 ether;
+      employees[index].lastPayday = now;
+
+      totalSalary -= delta_salary;
+
+      _partialPaid(employee);
+    }
+
+    function addFund() payable returns (uint) {
+      return this.balance;
+    }
+
+    function calculateRunway() constant returns (uint) {
+        // uint totalSalary = 0;
+        // for (uint i = 0; i < employees.length; i++) {
+        //     totalSalary += employees[i].salary;
+        // }
+        return this.balance / totalSalary;
+    }
+
+    function hasEnoughFund() constant returns (bool) {
+      return calculateRunway() > 0;
+    }
+
+    function getPaid() {
+      var (employee, index) = _findEmployee(msg.sender);
+      assert(employee.id != 0x00);
+
+      uint nextPayday = employee.lastPayday + payDuration;
+      assert(nextPayday < now);
+
+      employees[index].lastPayday = nextPayday;
+      employees[index].id.transfer(employees[index].salary);
+    }
+}

Lesson-2/assignment/yours_ver1.sol

@@ -0,0 +1,104 @@
+pragma solidity ^0.4.14;
+
+contract Payroll {
+    struct Employee {
+        address id;
+        uint salary;
+        uint lastPayday;
+    }
+
+    uint constant payDuration = 10 seconds;
+
+    address owner;
+    Employee[] employees;
+
+    function Payroll() {
+        owner = msg.sender;
+    }
+
+    function _partialPaid(Employee employee) private {
+      if (employee.id != 0x0) {
+          uint payment = employee.salary * (now - employee.lastPayday) / payDuration;
+          employee.id.transfer(payment);
+      }
+    }
+
+    function _findEmployee(address e) private returns (Employee, uint) {
+      for(uint i = 0; i < employees.length; i++) {
+          if(employees[i].id == e) {
+              return (employees[i], i);
+          }
+      }
+    }
+
+    function getAllEmployees() returns (address[], uint[], uint[]){
+      require(msg.sender == owner);
+      address[] memory addrs = new address[](employees.length);
+      uint[]    memory salays = new uint[](employees.length);
+      uint[]    memory lastpds = new uint[](employees.length);
+
+      for (uint i = 0; i < employees.length; i++) {
+          Employee storage employee = employees[i];
+          addrs[i] = employee.id;
+          salays[i] = employee.salary;
+          lastpds[i] = employee.lastPayday;
+      }
+
+      return (addrs, salays, lastpds);
+    }
+
+    function addEmployee(address e, uint s) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id == 0x00);
+      employees.push(Employee(e, s * 1 ether, now));
+    }
+
+    function removeEmployee(address e) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id != 0x00);
+      delete employees[index];
+      employees[index] = employees[employees.length-1];
+      employees.length--;
+    }
+
+    function updateEmployee(address e, uint s) {
+      require(msg.sender == owner);
+      var (employee, index) = _findEmployee(e);
+      assert(employee.id != 0x00);
+
+      employees[index].id = e;
+      employees[index].salary = s * 1 ether;
+      employees[index].lastPayday = now;
+
+      _partialPaid(employee);
+    }
+
+    function addFund() payable returns (uint) {
+      return this.balance;
+    }
+
+    function calculateRunway() returns (uint) {
+        uint totalSalary = 0;
+        for (uint i = 0; i < employees.length; i++) {
+            totalSalary += employees[i].salary;
+        }
+        return this.balance / totalSalary;
+    }
+
+    function hasEnoughFund() returns (bool) {
+      return calculateRunway() > 0;
+    }
+
+    function getPaid() {
+      var (employee, index) = _findEmployee(msg.sender);
+      assert(employee.id != 0x00);
+
+      uint nextPayday = employee.lastPayday + payDuration;
+      assert(nextPayday < now);
+
+      employees[index].lastPayday = nextPayday;
+      employees[index].id.transfer(employees[index].salary);
+    }
+}