status-im
/
status-network-token
mirror of https://github.com/status-im/status-network-token.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
333 Commits 31 Branches 0 Tags 5.8 MiB
Commit Graph

333 Commits

Author SHA1 Message Date
Jordi Baylina bede99743f Fix readme 2017-06-15 21:26:19 +02:00
Jordi Baylina 2266efc57a Romove an unused File 2017-06-15 19:54:23 +02:00
Jarrad Hope 647a8569da clarity on review 2017-06-15 16:11:42 +08:00
Jarrad c51f469258 Merge pull request #92 from nfnty/failsafe 
Enforce fail-safe for total collected
 2017-06-15 15:18:48 +08:00
nfnty a6a2012999
contracts: StatusContribution: Rename `cap` to `toCollect` 2017-06-15 08:28:38 +02:00
nfnty fe50df9e80
contracts: StatusContribution: Enforce fail-safe for total collected 
Fixes #86
Fixes #91
 2017-06-15 08:28:22 +02:00
nfnty c5649d60ab
Revert "Moving failsafe check to doBuy so that it covers both normal and guaranteed transactions." 
This reverts commit 13b04f6f59.
 2017-06-15 08:23:38 +02:00
Jarrad b058a51590 Merge pull request #91 from colterj199/master 
Moving failsafe check to doBuy so that it covers both normal and guar…
 2017-06-15 13:55:35 +08:00
Jarrad c095fa25ce Merge pull request #90 from nfnty/cleanup 
contracts: Minor cleanup
 2017-06-15 13:23:22 +08:00
marka 13b04f6f59 Moving failsafe check to doBuy so that it covers both normal and guaranteed transactions. 2017-06-14 21:46:52 -07:00
nfnty 7be23a4035
contracts: Minor cleanup 2017-06-15 06:15:01 +02:00
Jarrad 8fad65aa1c Merge pull request #89 from status-im/audit 
Preliminary Audit Results
 2017-06-15 12:11:21 +08:00
Jarrad Hope a5cb8f528c preliminary audit results 2017-06-15 12:05:38 +08:00
Jarrad a27d9d4baf Merge pull request #88 from status-im/revert-80-sgtLimit 
Revert "First Ceiling SGT Holders up to limit"
 2017-06-15 11:34:27 +08:00
Jarrad 6f1a01184a Revert "First Ceiling SGT Holders up to limit" 2017-06-15 11:30:05 +08:00
Jarrad 2e7913d576 Merge pull request #80 from status-im/sgtLimit 
First Ceiling SGT Holders up to limit
 2017-06-14 23:15:23 +08:00
Jordi Baylina b891a91c5e SGT holders only with a SGTLimit per SGT 2017-06-14 16:56:45 +02:00
Jarrad d36b778e93 Merge pull request #78 from nfnty/scripts_calcs 
scripts: ceiling_curve_calc: Clarify token fee limit
 2017-06-14 19:36:32 +08:00
nfnty abe6b51870
scripts: ceiling_curve_calc: Clarify token fee limit 2017-06-14 12:21:25 +02:00
Jarrad 292f89b0c9 Merge pull request #76 from nfnty/revealmulti_lengths 
contracts: DynamicCeiling: Fix lengths check for `revealMulti`
 2017-06-14 18:08:41 +08:00
nfnty 5a2c05ee65
contracts: DynamicCeiling: Fix lengths check for `revealMulti` 2017-06-14 12:05:05 +02:00
Jarrad 216be60d92 Merge pull request #75 from nfnty/scripts_calcs 
scripts: ceiling_curve_calc: Implement fees and time
 2017-06-14 17:58:41 +08:00
nfnty 6e2c198f9f
scripts: ceiling_curve_calc: Implement fees and time 2017-06-14 11:52:01 +02:00
Jarrad 1e77a59cda Merge pull request #72 from nfnty/assert_require 
contracts: Convert `throw` into `assert` and `require`
 2017-06-14 15:57:20 +08:00
Jordi Baylina 3639c0d127 Merge pull request #73 from status-im/BlockchainLabsNZ-tests/fail_assertion 
Blockchain labs nz tests/fail assertion
 2017-06-14 09:17:01 +02:00
Jordi Baylina cb89621ce8 Fix the test that was not done correctly 2017-06-14 08:58:26 +02:00
Jarrad 1d5fb6ab5a Merge pull request #71 from nfnty/reveal_multi 
DynamicCeiling: Implement reveal of multiple curves at once
 2017-06-14 14:10:17 +08:00
nfnty 08bc88946a
contracts: Convert `throw` into `assert` and `require` 2017-06-14 07:56:35 +02:00
Jarrad 6daa0702c0 Create README.md 2017-06-14 13:33:04 +08:00
Jarrad 168e6f8aaf Create README.md 2017-06-14 13:31:11 +08:00
nfnty a9c788bb58
DynamicCeiling: Implement reveal of multiple curves at once 
Fixes #32
 2017-06-14 07:12:59 +02:00
Jarrad 42f7a11702 Merge pull request #65 from nfnty/curve_params 
DynamicCeiling: Implement `slopeFactor` and `collectMinimum` per curve
 2017-06-14 11:26:49 +08:00
Jarrad f195a73743 Merge pull request #68 from status-im/Martin 
Various small improvements
 2017-06-14 11:22:54 +08:00
Klaus Hott Vidal e9cd109ef4 testing for the web3 error outside the catch 2017-06-14 13:35:41 +12:00
Jordi Baylina a92412a6ee Remove more spaces 2017-06-13 22:03:34 +02:00
Jordi Baylina 5625468518 Spaces and Solidity Version in ERC20Token.sol 2017-06-13 22:02:56 +02:00
Jordi Baylina 518bb4649c Various small improvements 2017-06-13 22:00:44 +02:00
nfnty 4aabb389b8
DynamicCeiling: Implement `slopeFactor` and `collectMinimum` per curve 
Fixes #58
 2017-06-13 18:05:45 +02:00
Jarrad 3427db4d49 Merge pull request #64 from nfnty/point_curve 
DynamicCeiling: Rename `point` to `curve`
 2017-06-13 22:03:24 +08:00
nfnty c4ec737499
DynamicCeiling: Rename `point` to `curve` 2017-06-13 15:42:16 +02:00
Jordi Baylina 5fdf37dcd2 Merge pull request #61 from status-im/finishedBlock 
Freeze SGT block distribution when finalized sale
 2017-06-13 15:32:08 +02:00
Jordi Baylina 5265d42128 Merge branch 'master' into finishedBlock 2017-06-13 15:27:08 +02:00
Jarrad 81a6bfde3c Merge pull request #63 from nfnty/sgt_period 
StatusContribution: Remove SGT contribution period
 2017-06-13 21:21:18 +08:00
nfnty 139c5c6291
StatusContribution: Remove SGT contribution period 
Fixes #62
 2017-06-13 15:17:14 +02:00
Jordi Baylina c86ad415e9 Merge branch 'master' into finishedBlock 2017-06-13 15:13:30 +02:00
Jarrad aa027c9dc0 Merge pull request #59 from nfnty/moving_curves 
Moving curves
 2017-06-13 21:06:23 +08:00
nfnty 0e25de17f5
contracts: DynamicCeiling: Refactor `moveNext` to `moveTo` 
Prevents index changing before transaction is processed.
 2017-06-13 14:00:41 +02:00
nfnty e94b53b751
contracts: DynamicCeiling: Add comments, Improve rigidity of index relation 2017-06-13 13:52:28 +02:00
nfnty 93026242cd
Revert "DynamicCeiling: Rename `point` to `curve`" 
This commit reverts 05cdd1365f.
 2017-06-13 13:46:49 +02:00
Jordi Baylina 78af09654b Freeze SGT block distribution when finalized sale 2017-06-13 12:04:54 +02:00