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
nfnty ec95dabd79
tests: contribution: Implement moving curve index 2017-06-13 06:44:20 +02:00
nfnty 6a913f2584
contracts: StatusContribution: Fix premature `finalize()` 2017-06-13 06:22:14 +02:00
nfnty 9659b46afb
DynamicCeiling: Enforce callees 2017-06-13 06:10:36 +02:00
nfnty acfbefa430
tests: helpers: Update mock versions 2017-06-13 06:10:36 +02:00
nfnty 37fe164610
tests: DynamicCeiling: Implement moving curve index 2017-06-13 06:10:36 +02:00
nfnty c54625bb48
scripts: ceiling_curve_calc: Add ability to specify collected start 2017-06-13 06:10:36 +02:00
nfnty fa56d629ae
Add scripts for `DynamicCeiling` calculations 2017-06-13 06:10:36 +02:00
nfnty 823cfb515c
contracts: DynamicCeiling: Use `collectMinimum` until `difference` is less 2017-06-13 06:10:36 +02:00
nfnty da4952f224
contracts: StatusContribution: Handle `toFund == 0` 
We need to handle this case since if it throws the ceiling index will
revert in the case where `collected == limit`.
 2017-06-13 06:10:35 +02:00
nfnty e74f6dfaab
contracts: DynamicCeiling: Fix comments 2017-06-13 06:10:35 +02:00
nfnty 3ff2616333
tests: Implement moving curve index 2017-06-13 06:09:06 +02:00
nfnty 05cdd1365f
DynamicCeiling: Rename `point` to `curve` 2017-06-12 14:30:09 +02:00
nfnty 1917f98976
tests: DynamicCeiling: Implement moving point index 2017-06-12 14:29:21 +02:00
nfnty 40e636e379
contracts: DynamicCeiling: Implement moving point index 2017-06-12 14:29:21 +02:00
Jarrad 39a80815d4 Merge pull request #56 from nfnty/returns_spacing 
contracts: Fix spacing after `returns`
 2017-06-12 20:22:05 +08:00
nfnty d13eb11b1b
contracts: Fix spacing after `returns` 2017-06-12 14:10:32 +02:00
Jarrad e6c70b8078 Merge pull request #54 from nfnty/explicit_sizes 
Explicit sizes
 2017-06-12 13:19:23 +08:00
nfnty 9f1cd93479
contracts: Use explicit sizes for variables 
Exclude externally imported contracts

Fixes #40
 2017-06-12 07:14:33 +02:00
Jarrad 8773ad94b9 Merge pull request #55 from nfnty/endblock 
contracts: Refactor `stopBlock` to `endBlock`
 2017-06-12 13:06:18 +08:00
Jordi Baylina df5fa2cb85 Merge pull request #53 from nfnty/contributionwallet_withdraw 
contracts: ContributionWallet: refactor `withdraw()`
 2017-06-12 00:09:50 +02:00
nfnty 1c86d57af2
contracts: Refactor `stopBlock` to `endBlock` 
Fixes #28
 2017-06-11 19:16:23 +02:00
nfnty 100872831e
contracts: ContributionWallet: refactor `withdraw()` 2017-06-11 18:43:38 +02:00
nfnty 1ea26c47d7 contracts: StatusContribution: Fix missing underscore for event parameter (#52) 2017-06-11 18:41:10 +02:00
nfnty f2775917ec contracts: Use Safemath from OpenZeppelin (#45) 
* contracts: SafeMath: Use builtin `assert`

Fixes #43

* contracts: Use `SafeMath` library from OpenZeppelin
 2017-06-11 18:40:35 +02:00
nfnty a27abda551 contracts: Rename `MultisigWallet` to `MultiSigWallet`; like upstream (#51) 2017-06-11 18:24:49 +02:00
nfnty 267d4e5fcc contracts: Use `.transfer()` instead of `.send()` (#46) 
Fixes #42
 2017-06-11 18:23:54 +02:00
nfnty c3531cd7f7 Fix tests formatting (#49) 
* tests: Fix formatting

Fixes #36

* tests: contribution: Fix variable spelling errors

* sgtGeneration: Fix formatting
 2017-06-11 18:00:26 +02:00
Jarrad a07448c904 Merge pull request #50 from nfnty/curvepoint_revealed_fix 
contracts: StatusContribution: Fix `CurvePoint` extracted members
 2017-06-11 22:05:38 +08:00
nfnty 84dcf68cb2
contracts: StatusContribution: Fix `CurvePoint` extracted members 
Followup fix for #14.
 2017-06-11 16:04:10 +02:00
Jarrad d3459398c5 Merge pull request #47 from nfnty/function_explicit_modifier 
contracts: Explicit function modifiers
 2017-06-11 21:36:32 +08:00
Jarrad 84daff7d0e Merge pull request #17 from nfnty/startblock 
contracts: StatusContribution: Enforce start block after current
 2017-06-11 21:25:14 +08:00
Jarrad 6741edd54e Merge pull request #14 from nfnty/dynamic_point_revealed 
contracts: DynamicCeiling: Remove unused `CurvePoint.revealed`
 2017-06-11 21:13:35 +08:00
Jarrad bb1c04bebc Merge pull request #48 from nfnty/event_underscore 
contracts: Underscore all `event` parameters
 2017-06-11 21:09:01 +08:00
nfnty 263187c342
contracts: Explicit function modifiers 
Fixes #27
 2017-06-11 15:07:50 +02:00
nfnty b88d23730f
contracts: Underscore all `event` parameters 
Fixes #35
 2017-06-11 14:57:27 +02:00
Jarrad e88114de66 Merge pull request #44 from nfnty/contracts_formatting 
contracts: Fix formatting
 2017-06-11 20:35:38 +08:00
nfnty 9ea8c28752
contracts: Fix formatting: Minor indentation correction 2017-06-11 11:42:56 +02:00
nfnty f5789fe841
contracts: Fix formatting 
Partial fix for #36
 2017-06-11 02:18:54 +02:00
Jordi Baylina 8a4c85d18d Merge pull request #41 from nfnty/tests_travis_testrpc 
tests: travis: Remove `testrpc` arguments
 2017-06-11 00:11:51 +02:00
nfnty 675034f520
tests: travis: Remove `testrpc` arguments 
Prevents us from testing in a real like environment.
 2017-06-10 23:59:37 +02:00
Jordi Baylina a4d4d6a5ed Merge pull request #26 from johnzweng/review_john 
Changes in comments
 2017-06-10 23:34:42 +02:00
Jordi Baylina bffb79b4e8 Merge pull request #25 from nfnty/yarn 
tests: Replace npm with yarn
 2017-06-10 23:34:05 +02:00
Johannes Zweng 194a4ab081 Only changes in comments 
mostly spelling, only in a few cases further clarifications
 2017-06-10 16:04:59 +02:00
Jarrad dda88ee1ea Merge pull request #22 from status-im/limitSGT 
SGT fixed limit and contribution period. Set also sgtPreferenceBlock as variable.
 2017-06-10 16:39:36 +08:00
Jordi Baylina 061926365d Merge branch 'master' into limitSGT 2017-06-10 09:32:42 +02:00
nfnty 5cd9a53dcb
tests: Replace npm with yarn 
Cuts testing time in half
 2017-06-10 07:55:47 +02:00
Jordi Baylina c8aa9f0c28 Merge pull request #24 from nfnty/testing_travis 
Fix Travis CI and tests failing
 2017-06-09 18:59:22 +02:00
nfnty 46821a07af
contracts: MultisigWallet: Fix contract name, Fixes tests 2017-06-09 17:33:41 +02:00
nfnty cd8122180a
README: Fix Travis CI link 2017-06-09 17:33:41 +02:00
nfnty 8cefaf3ae7
tests: Use Travis CI cache 2017-06-09 17:33:41 +02:00