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
359 Commits 31 Branches 0 Tags 5.8 MiB
Commit Graph

359 Commits

Author SHA1 Message Date
nfnty 440c215fdf
truffle: Add mainnet and testnets, Use mnemonic 2017-06-16 09:03:00 +02:00
nfnty a51cd53e51
package.json: Remove unused dependencies 2017-06-16 09:03:00 +02:00
nfnty 8429646877
Downgrade truffle due to `require()` not working 2017-06-16 09:03:00 +02:00
nfnty b9b91472de
tests: Fix descriptions 2017-06-16 08:54:58 +02:00
nfnty b65232281b
tests: `maxSGTSupply` constant 2017-06-16 08:54:11 +02:00
nfnty d94e96beec
tests: Fix name `multisigComunity` -> `multisigCommunity` 2017-06-16 08:54:11 +02:00
nfnty baf07ee582
tests: Fix ordering 2017-06-16 08:54:07 +02:00
nfnty 941b3e3494
tests: Rename `miniMeFactory` -> `miniMeTokenFactory` 2017-06-16 08:53:28 +02:00
nfnty 53ffe1be85
tests: Name the addresses 2017-06-16 08:53:28 +02:00
Jarrad 60c0a33e2c Merge pull request #107 from nfnty/initialize_params_order 
contracts: StatusContribution: Fix ordering of `initialize()` parameters
 2017-06-16 14:52:37 +08:00
nfnty e811e62d78
contracts: StatusContribution: Fix ordering of `initialize()` parameters 2017-06-16 08:39:19 +02:00
Jarrad 469adceb17 Merge pull request #93 from nfnty/tests_moving 
Move test contracts
 2017-06-16 14:38:48 +08:00
Jarrad 54c64f82cb Merge pull request #95 from nfnty/sntaddress 
contracts: StatusContribution: `_sntAddress` -> `_snt`
 2017-06-16 14:34:30 +08:00
Jarrad 8956cb5c2e Merge pull request #94 from nfnty/reserve 
Rename "second sale" to "reserve".
 2017-06-16 14:25:55 +08:00
Jarrad 4d262017b7 Merge pull request #96 from status-im/sgtOwned 
Sgt Controller should not be SGT exchange.
 2017-06-16 14:25:34 +08:00
Jarrad 29f65d0f9b Merge pull request #105 from BlockchainLabsNZ/bugfix/uint_and_linear_formula 
Change in the order of execution of the formula
 2017-06-16 14:24:21 +08:00
Jarrad 7e40b45042 Merge pull request #103 from nfnty/calculate_hash 
contracts: DynamicCeiling: Use `calculateHash` for `revealCurve`
 2017-06-16 14:22:44 +08:00
Klaus Hott Vidal 61928dc7b6 undoing unnecessary changes on the tests 2017-06-16 16:17:17 +12:00
Klaus Hott Vidal ab4935122f Change in the order of execution of the formula to avoid having any amount of time below 2 years be floored to 0 by uint 2017-06-16 15:48:51 +12:00
nfnty c85c229505
contracts: DynamicCeiling: Use `calculateHash` for `revealCurve` 
Fixes #102
 2017-06-15 22:45:45 +02:00
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
Jordi Baylina d06b8fab2d Tests fixed 2017-06-15 14:21:08 +02:00
Jordi Baylina e7959f5e71 SGT can be the normal owner 2017-06-15 14:13:09 +02:00
nfnty c55933840d
contracts: StatusContribution: `_sntAddress` -> `_snt` 2017-06-15 13:48:55 +02:00
nfnty b81ad99079
Rename "second sale" to "reserve". 2017-06-15 13:44:31 +02:00
nfnty 6074f52494
tests: Move mock contracts to `contracts/test` 2017-06-15 13:30:36 +02:00
nfnty bee0d2fc8c
tests: helpers: Bump Solidity version 2017-06-15 11:03:48 +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