Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assignment 5+6 #502

Open
wants to merge 144 commits into
base: 88-李晨曦
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
e695901
Create 测试
public2018 Dec 27, 2017
ca7f645
Create payroll.sol
Xuefeng-Zhu Jan 7, 2018
8d3f77d
Merge pull request #1 from linjie-1/master
Jan 7, 2018
e55edb6
update lesson folder
Jan 7, 2018
623e1ac
Merge pull request #12 from helloworldblockchain/master
Jan 7, 2018
3319fd5
Delete 软件测试1
Jan 7, 2018
3c04fea
Create yours.sol
Jan 7, 2018
ddc0fb1
Update yours.sol
Jan 7, 2018
76f556b
Create README.md
Jan 7, 2018
ee3a179
Create README.md
Jan 7, 2018
f0ae971
Update README.md
Jan 7, 2018
94e186c
Update README.md
Jan 7, 2018
875e149
Create README.md
Jan 7, 2018
c29a23e
Update README.md
Jan 7, 2018
2c0b136
Update README.md
Jan 7, 2018
55e7427
Update README.md
Jan 7, 2018
251bd4f
Update README.md
Jan 7, 2018
17ceaa5
Update README.md
Jan 7, 2018
388575e
Merge pull request #1 from linjie-1/master
zli25 Jan 7, 2018
dd09e78
Update README.md
linjie-1 Jan 7, 2018
a89e214
Update README.md
linjie-1 Jan 7, 2018
c794e3c
Update and rename lesson1/README.md to 2014/07/23/README.md
linjie-1 Jan 7, 2018
b2d1bd2
changshi xiugai master
Crapulencer Jan 7, 2018
047ed69
chexiaocaozuo
Crapulencer Jan 7, 2018
b777a5f
Rename 2014/07/23/README.md to lesson1/README.md
Jan 7, 2018
d2a8fa5
Merge pull request #32 from public2018/master
public2018 Jan 8, 2018
d2c795d
Update README.md
linjie-1 Jan 8, 2018
040a107
Update README.md
linjie-1 Jan 8, 2018
b3be527
Update README.md
linjie-1 Jan 8, 2018
f06e298
Update README.md
linjie-1 Jan 8, 2018
b90d86f
payroll homework
Jan 8, 2018
0c1e86f
Merge branch '91-Chris' of https://github.com/taojing10/guigulive-ope…
Jan 8, 2018
8512a0c
remove orginal address
Jan 8, 2018
36dd3f1
Update README.md
Jan 8, 2018
3dd59ce
Update README.md
Jan 8, 2018
293161a
Update README.md
linjie-1 Jan 8, 2018
81bd092
Delete 测试
Jan 8, 2018
e4e5383
将课程表的图片替换成markdown实现
lsdlinshunda Jan 8, 2018
d60b6b0
第一次作业
0xfynnix Jan 8, 2018
901d828
first homework
seanxwzhang Jan 9, 2018
db44ac5
Revert "first homework"
seanxwzhang Jan 9, 2018
7952c08
第一次作业
BitEveryXW Jan 9, 2018
2874dfb
Merge pull request #2 from linjie-1/master
steven672 Jan 9, 2018
27587f6
Create 第一课作业
steven672 Jan 9, 2018
04d95b4
Delete 第一课作业
steven672 Jan 9, 2018
3040b06
Update yours.sol
steven672 Jan 9, 2018
503a54a
拆分函数
0xfynnix Jan 9, 2018
371670a
.
0xfynnix Jan 9, 2018
da27d33
.
0xfynnix Jan 9, 2018
ce541bd
优化
0xfynnix Jan 9, 2018
c6032c2
Merge pull request #1 from linjie-1/master
zl777 Jan 10, 2018
1d31ebb
Update README.md
linjie-1 Jan 10, 2018
d64d000
Update README.md
linjie-1 Jan 10, 2018
c30b7c5
Update README.md
linjie-1 Jan 10, 2018
b8802e3
Update README.md
linjie-1 Jan 10, 2018
46f2a72
Create README.md
linjie-1 Jan 10, 2018
b6414d5
Create README.md
linjie-1 Jan 10, 2018
6a024e5
Update README.md
linjie-1 Jan 10, 2018
1452883
Create README.md
linjie-1 Jan 10, 2018
2b8da80
Update README.md
linjie-1 Jan 10, 2018
f98dcab
Create yours.sol
linjie-1 Jan 10, 2018
529ef5a
Update README.md
linjie-1 Jan 10, 2018
39b2136
Delete yours.sol
linjie-1 Jan 10, 2018
a298b92
Create yours.sol
linjie-1 Jan 10, 2018
65f8dc3
Delete yours.sol
linjie-1 Jan 10, 2018
758a324
Create yours.sol
lsdlinshunda Jan 10, 2018
602f1c1
Update yours.sol
zl777 Jan 10, 2018
5483f5e
lesson 2
modong Jan 10, 2018
ca137ac
Merge remote-tracking branch 'upstream/master'
0xfynnix Jan 10, 2018
3af7f4f
调整课程表中课程更新时间
lsdlinshunda Jan 10, 2018
9ee0a7b
第一次作业 第二次提交 @1/12/18
BitEveryXW Jan 12, 2018
61681d3
Merge pull request #145 from BitEveryXW/XW_dev
BitEveryXW Jan 12, 2018
e164779
Revert "Xw dev"
BitEveryXW Jan 12, 2018
67064fd
Merge pull request #146 from linjie-1/revert-145-XW_dev
BitEveryXW Jan 12, 2018
10b864f
根据要求加了require 函数, 并更新了源代码的基本function。 还请老师在看下~
steven672 Jan 12, 2018
60f2dcd
update
steven672 Jan 12, 2018
8a87868
update
steven672 Jan 12, 2018
adbbd41
Merge remote-tracking branch 'upstream/master'
0xfynnix Jan 13, 2018
9923178
Merge pull request #1 from linjie-1/master
zyzlouis Jan 13, 2018
7852900
Merge pull request #170 from zli25/master
zli25 Jan 13, 2018
31eeb02
第二课作业
0xfynnix Jan 13, 2018
d07ab7f
Update yours.sol
zl777 Jan 13, 2018
b99b727
Merge pull request #217 from linjie-1/zl777-patch-1
hezhihua81 Jan 13, 2018
55fac2b
Merge pull request #3 from linjie-1/master
steven672 Jan 13, 2018
5b96d76
revert last mis-checkin...
hezhihua81 Jan 13, 2018
31621b6
Update
steven672 Jan 13, 2018
2e095ae
update hw2
steven672 Jan 13, 2018
dbff9b0
创建第三课目录
lsdlinshunda Jan 14, 2018
78fa6e7
添加第三课说明
lsdlinshunda Jan 14, 2018
4d8f45b
添加第三课作业说明
lsdlinshunda Jan 14, 2018
afdae0c
Merge remote-tracking branch 'upstream/master'
0xfynnix Jan 15, 2018
c85308b
第三课
0xfynnix Jan 15, 2018
bd71370
第三课
0xfynnix Jan 15, 2018
718e0e6
第三课
0xfynnix Jan 15, 2018
1010b85
Merge branch 'master' into master
steven672 Jan 17, 2018
80e53bb
delete hw2
steven672 Jan 17, 2018
ec1f212
restore
steven672 Jan 17, 2018
e52488a
Merge pull request #2 from linjie-1/master
zyzlouis Jan 17, 2018
20e9d21
hw-2
Jan 17, 2018
68df86a
Merge pull request #304 from zl777/master
zl777 Jan 17, 2018
bf357cf
Create README.md
linjie-1 Jan 17, 2018
50c15e3
Create README.md
linjie-1 Jan 17, 2018
83e2b9b
Create payroll.sol
linjie-1 Jan 17, 2018
b38d0ff
Create README.md
linjie-1 Jan 17, 2018
953eab2
Create yours.sol
linjie-1 Jan 17, 2018
e28b1b3
Delete yours.sol
linjie-1 Jan 17, 2018
b72fc45
Create yours.sol
linjie-1 Jan 17, 2018
c66e0cc
Update yours.sol
linjie-1 Jan 17, 2018
159bd42
Revert "第3课的代码"
lsdlinshunda Jan 17, 2018
cdece6b
Merge pull request #315 from linjie-1/revert-304-master
lsdlinshunda Jan 17, 2018
656972c
Merge branch 'master' of https://github.com/linjie-1/guigulive-operation
Jan 17, 2018
d355bf4
HW-3
Jan 17, 2018
15f22fd
Merge pull request #321 from zyzlouis/master
zyzlouis Jan 18, 2018
e8a7a93
Revert "Get 第四课"
lsdlinshunda Jan 18, 2018
e8c390c
Merge pull request #327 from linjie-1/revert-321-master
lsdlinshunda Jan 18, 2018
08dd48c
修改附加题
0xfynnix Jan 19, 2018
3f5d92f
增加代码
0xfynnix Jan 20, 2018
d4860f1
修改作业
0xfynnix Jan 20, 2018
7617e21
Merge branch 'master' of https://github.com/linjie-1/guigulive-operation
0xfynnix Jan 20, 2018
064653a
forth homework
Jan 20, 2018
386acd7
Merge pull request #316 from taojing10/master
LeapM Jan 20, 2018
e026572
修改作业
0xfynnix Jan 21, 2018
88acde5
.
0xfynnix Jan 21, 2018
3ec4c1e
Revert "91_HW-3"
lsdlinshunda Jan 22, 2018
1c6c8df
Merge pull request #396 from linjie-1/revert-316-master
lsdlinshunda Jan 22, 2018
e834fa8
添加第五课目录
lsdlinshunda Jan 22, 2018
6aa2351
whatever
Jan 22, 2018
b224d03
.
0xfynnix Jan 24, 2018
1cf87df
Merge branch 'master' of https://github.com/yangfan1992/guigulive-ope…
0xfynnix Jan 24, 2018
d4e113b
Merge branch 'master' of https://github.com/linjie-1/guigulive-operat…
0xfynnix Jan 24, 2018
5c8bac9
第五课作业
0xfynnix Jan 24, 2018
c5669e8
创建第六、七课目录
lsdlinshunda Jan 25, 2018
962e58f
.
0xfynnix Jan 26, 2018
a60310a
Merge branch 'master' of https://github.com/yangfan1992/guigulive-ope…
0xfynnix Jan 26, 2018
d88202a
Merge branch 'fifth_homework' of https://github.com/yangfan1992/guigu…
0xfynnix Jan 26, 2018
a841e2f
修改
0xfynnix Jan 26, 2018
9bc0cae
修改作业
0xfynnix Jan 27, 2018
f9fbe17
修改作业
0xfynnix Jan 27, 2018
223a6e8
修改
0xfynnix Jan 28, 2018
791bcb9
解决冲突
0xfynnix Jan 28, 2018
0276f7a
解决冲突
0xfynnix Jan 28, 2018
076e71b
Merge pull request #488 from yangfan1992/fifth_homework
washingweb Jan 29, 2018
4392414
Revert "54_陈扬帆_第五次作业(冲突已解决)"
washingweb Jan 31, 2018
9d2ec7d
Merge pull request #507 from linjie-1/revert-488-fifth_homework
washingweb Jan 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
95 changes: 0 additions & 95 deletions Lesson2/hw-2.sol

This file was deleted.

103 changes: 0 additions & 103 deletions Lesson3/assignment/yours.sol
Original file line number Diff line number Diff line change
@@ -1,104 +1 @@
/*作业请提交在这个目录下*/

//q1

pragma solidity ^0.4.14;

contract payRoll{
struct Employee {
address id;
uint salary;
uint lastPayday;
}

uint constant payDuration = 10 seconds;

address owner;
uint totalSalary;
mapping(address => Employee) employees;

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){
require(msg.sender == owner);

var employee = employees[employeeId];
assert(employee.id == 0x0);
totalSalary += salary * 1 ether;
employees[employeeId] = (Employee(employeeId, salary * 1 ether, now));
}

function removeEmployee(address employeeId){
require(msg.sender == owner);

var employee = employees[employeeId];

assert(employee.id == 0x0);
_partialPaid(employee);
totalSalary -= employees[employeeId].salary;
delete employees[employeeId];

}

function updateEmployee(address employeeId, uint salary) {
require(msg.sender == owner);

var employee = employees[employeeId];

assert(employee.id == 0x0);
_partialPaid(employee);
totalSalary -= employees[employeeId].salary;
employees[employeeId].salary = salary;
employees[employeeId].lastPayday = now;
totalSalary += employees[employeeId].salary;

}

function addFund() returns (uint) {
return this.balance;
}

function calculateRunway() returns (uint) {
return this.balance / totalSalary;
}

function hasEnoughFund() returns (bool) {
return calculateRunway() > 0;
}

function checckEmployee(address employeeId) returns (uint salary, uint lastPayday){
var employee = employees[employeeId];
salary = employee.salary;
lastPayday = employee.lastPayday;
}

function getPaid() {
var employee = employees[msg.sender];
assert(employee.id == 0x0);


uint nextPayday = employee.lastPayday + payDuration;
assert(nextPayday < now);

employee.lastPayday = nextPayday;
employee.id.transfer(employee.salary);
}

}


/// q2
function changePaymentAddress(address employeeId, address newEmployeeId) onlyOwner employeeExist(employeeId) {
var employee = employees[employeeId];

_partialPaid(employee);
employees[employeeId].id = newEmployeeId;
employees[newEmployeeId].lastPayday = now;
}
38 changes: 0 additions & 38 deletions lesson1/hw-1.sol

This file was deleted.

1 change: 0 additions & 1 deletion 【测试】第一课作业

This file was deleted.