Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
23a28fb
Update and rename yours.sol to 56_胡闰祺_第一次作业.sol
aceRunqi Mar 14, 2018
33729c4
Merge pull request #1 from Guigulive/master
aceRunqi Mar 15, 2018
c38345b
Update and rename yours.sol to 56_胡闰祺_第二次作业.sol
aceRunqi Mar 17, 2018
e199e9d
Upload lesson 3
JASONews Mar 18, 2018
de2ed59
Upload lesson 3
JASONews Mar 18, 2018
cd1f5f0
Merge pull request #36 from aceRunqi/master
taxic Mar 19, 2018
2e9dc31
Revert "56_胡闰祺_第二次作业"
taxic Mar 19, 2018
ea0b6f3
Merge pull request #37 from Guigulive/revert-36-master
taxic Mar 19, 2018
52b0f16
Merge pull request #3 from Guigulive/master
Huaida Mar 21, 2018
2680e63
Update yours.sol
Huaida Mar 21, 2018
08b405b
Add files via upload
Huaida Mar 21, 2018
ce37b66
Create C3 Linearization.sol
Huaida Mar 21, 2018
116b1ca
Update C3 Linearization.sol
Huaida Mar 21, 2018
9dc46f5
Upload lesson 4
JASONews Mar 22, 2018
bc6d17b
Merge pull request #4 from Guigulive/master
Huaida Mar 25, 2018
fc80eab
修改payroll
Huaida Mar 25, 2018
fba34bc
加入对ownable类库的使用
Huaida Mar 25, 2018
d120f01
truffle migration
Huaida Mar 25, 2018
d9d09af
truffle migration
Huaida Mar 25, 2018
d6443b4
Error
Huaida Mar 25, 2018
c3c007e
Error
Huaida Mar 25, 2018
9abd1fb
Error
Huaida Mar 25, 2018
d5a7797
Error
Huaida Mar 25, 2018
e175136
truffle migrate Payroll.sol successful
Huaida Mar 25, 2018
559bd09
truffle migrate successful
Huaida Mar 25, 2018
9011da3
Upload lesson 5
JASONews Mar 25, 2018
b122868
payroll.sol的js测试代码
Huaida Mar 25, 2018
654e3f9
之前理解错误
Huaida Mar 25, 2018
152a254
添加test solidity文件
Huaida Mar 25, 2018
fff04d0
Update TestPayroll.sol
Huaida Mar 25, 2018
c68d61a
js测试代码跑通截图
Huaida Mar 28, 2018
d99255f
Merge pull request #5 from Guigulive/master
Huaida Mar 28, 2018
cbf7db4
Update App.js
Huaida Mar 28, 2018
68d62f1
Update Payroll.sol
Huaida Mar 28, 2018
0ee5d61
Update Common.js
Huaida Mar 28, 2018
993f8dc
Update Employee.js
Huaida Mar 28, 2018
44f4beb
Update EmployeeList.js
Huaida Mar 28, 2018
5fd6042
Update Employer.js
Huaida Mar 28, 2018
a59e9fe
Update Fund.js
Huaida Mar 28, 2018
16cc425
Upload lesson 6
JASONews Mar 29, 2018
8e3d19e
Merge pull request #6 from Guigulive/master
Huaida Mar 31, 2018
99b242b
6
Huaida Mar 31, 2018
787bf80
lesson 6
Huaida Mar 31, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Lesson-3/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## 硅谷live以太坊智能合约频道官方地址

### 第三课《智能合约后端优化和产品化》

目录结构
<br/>|
<br/>|--orgin 课程初始代码
<br/>|
<br/>|--assignment 课程作业提交代码
<br/>
### 本节知识点
第3课:智能合约后端优化和产品化
- 如何通过数据结构优化降低合约执行成本
- 合约的继承
- 巧用modifier
- 以太坊函数库的使用和基本介绍
25 changes: 25 additions & 0 deletions Lesson-3/assignment/C3 Linearization.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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

https://en.wikipedia.org/wiki/C3_linearization
https://blog.tedxiong.com/C3_Linearization.html

solidity的继承链是靠右的更近,这点和python不一样

L[O] = [O]
L[A] = [A,O]
L[B] = [B,O]
L[C] = [C,O]
L[k1] = [K1]+merge(L[B],L[A],[B,A]) // merge规则:按照继承顺序加入merge,最后再加一个所有父类顺序添加的序列
= [K1]+merge([B,O],[A,O],[B,A]) // 规则:取一个元素(它是其他序列中的第一个元素,或不在其他序列出现,如果有多个元素符合,选前面一个)加到最前序列后面
= [K1,B]+merge([O],[A,O],[A])
= [K1,B,A,O]
L[K2] = [k2,C,A,O]
L[Z] = [Z] + merge(L[K2],L[K1],[K2,K1])
= [Z] + merge([K2,C,A,O],[k1,B,A,O],[K2,K1])
= [Z,K2,C,K1,B,A,O]
14 changes: 14 additions & 0 deletions Lesson-3/assignment/README.md
Original file line number Diff line number Diff line change
@@ -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
Binary file added Lesson-3/assignment/WX20180321-162512@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Lesson-3/assignment/WX20180321-162543@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions Lesson-3/assignment/payroll.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
pragma solidity ^0.4.14;
import './SafeMath.sol';
import './Ownable.sol';

contract Payroll is Ownable{

using SafeMath for uint;

struct Employee{
address employeeAddress;
uint salary;
uint lastPayday;
}
mapping(address => Employee) public employeeMapping;
uint constant payDuration = 30 seconds;
address ownerAddress;
uint totalSalary = 0;


modifier employeeExist(address addr){
var employee = employeeMapping[addr];
require(employee.employeeAddress != 0x0);
_;
}

function _partialPay(Employee emp) private{
uint totalSalary = emp.salary.mul(now.sub(emp.lastPayday)).div(payDuration);

emp.employeeAddress.transfer(totalSalary);
}

function addEmployee(address addr,uint sal) onlyOwner {

uint oneSalary = sal.mul(1 ether);
totalSalary = totalSalary.add(oneSalary);
employeeMapping[addr] = Employee(addr,oneSalary,now);
}
function removeEmployee(address addr) onlyOwner employeeExist(addr){
var employee = employeeMapping[addr];
totalSalary = totalSalary.sub(employee.salary);
_partialPay(employee);
delete(employeeMapping[addr]);

}
function updateEmployee(address oldAddress,address newAddresss,uint sal) onlyOwner employeeExist(oldAddress){

var employee = employeeMapping[oldAddress];
uint oneSalary = sal.mul(1 ether);
totalSalary = totalSalary.sub(employee.salary).add(oneSalary);
employee.employeeAddress = newAddresss;
employee.salary = oneSalary;

}
function changePaymentAddress(address oldAddress,address newAddresss) onlyOwner employeeExist(oldAddress){
var employee = employeeMapping[oldAddress];
employee.employeeAddress = newAddresss;
}


function calculateRunway() view returns(uint){

uint selfbalance = getAddressBalance(this);
return selfbalance.div(totalSalary);
}
function hasEnoughFund() returns(bool){
return calculateRunway() > 0;
}

function addFund() payable returns(uint){

return this.balance;
}


function getPaid() employeeExist(msg.sender) {
var employee = employeeMapping[msg.sender];
uint intervalTime = now.sub(employee.lastPayday);
require(intervalTime >= payDuration);

uint times = intervalTime.div(payDuration);
employee.lastPayday = employee.lastPayday.add(times.mul(payDuration));
employee.employeeAddress.transfer(employee.salary.mul(times));
}

function getAddressBalance(address addr) public view returns(uint){
return addr.balance;
}

}
3 changes: 3 additions & 0 deletions Lesson-3/orgin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 硅谷live以太坊智能合约 第三课

这里是每一课的初始代码,有需要的同学可以参考
Empty file added Lesson-3/orgin/payroll.sol
Empty file.
16 changes: 16 additions & 0 deletions Lesson-4/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## 硅谷live以太坊智能合约频道官方地址

### 第四课《使用Truffle架构进行前后端交互,测试,部署》

目录结构
<br/>|
<br/>|--orgin 课程初始代码
<br/>|
<br/>|--assignment 课程作业提交代码
<br/>
### 本节知识点
第4课:使用Truffle架构进行前后端交互,测试,部署
- 为什么要用Truffle,Truffle的基本概念
- Truffle 的command line 功能
- 初始化项目与Truffle项目目录结构
- 编译部署合约到testrpc
Loading