Commit Graph

172 Commits

Author SHA1 Message Date
mbeylin bd8380b691 added real validation to activation 2017-06-06 17:02:56 -04:00
mbeylin 0a6ddd266d fixed notZero modifier 2017-06-06 14:12:00 -04:00
mbeylin e0abaa3180 Merge branch 'master' of https://github.com/ConsenSys/StandardBounties into feature/contribution-improvements 2017-06-06 14:11:31 -04:00
mbeylin 1fe14aa327 changed msg.sender to tx.origin in constructor 2017-05-31 14:36:43 -04:00
mbeylin af0e95f5bf Merge branch 'feature/contribution-improvements' of https://github.com/ConsenSys/StandardBounties into feature/contribution-improvements 2017-05-31 14:31:16 -04:00
Gonçalo Sá bd699803a5 linting edits 2017-05-29 20:08:39 +01:00
mbeylin 688fadb096 fixed ordering during create calling 2017-05-29 14:45:15 -04:00
mbeylin a6bb2370ba removed instances from factory 2017-05-29 14:41:58 -04:00
mbeylin e9d8589b8e small bug fixes 2017-05-29 14:39:44 -04:00
mbeylin bbedecc843 reverted changes 2017-05-29 14:07:18 -04:00
mbeylin 045468a31d bug fixes and adjustments to the standard factory 2017-05-24 01:43:32 -04:00
mbeylin 4e5d806ff8 ammended factory for simplified displaying 2017-05-23 21:32:28 -04:00
mbeylin 5d79d2a9bd Merge pull request #7 from ConsenSys/develop
Develop
2017-05-23 20:28:20 -04:00
mbeylin 6e08d49223 Merge pull request #6 from ConsenSys/feature/contribution-improvements
Feature/contribution improvements
2017-05-23 20:28:08 -04:00
mbeylin 9a3c835d28 syntax fixes 2017-05-23 20:24:10 -04:00
mbeylin 9239527c6b fixed modifier error 2017-05-23 19:56:51 -04:00
mbeylin 8b8dfe0719 Merge branch 'develop' into feature/contribution-improvements 2017-05-23 19:54:10 -04:00
mbeylin 1c6d583cb0 Created a factory for any generalized bounty 2017-05-23 19:51:00 -04:00
mbeylin 67000fc170 added a notIssuer modifier for those fulfilling the bounty. While this makes it trivially more difficult to actually accept the bounty you've issued, it properly expresses the meaning of the contract- that the issuer should not accept their own fulfillment (circumventing the killBounty function) 2017-05-23 19:43:56 -04:00
mbeylin c120c5f2b4 added new modifier to acceptFulfillment function 2017-05-23 19:32:23 -04:00
mbeylin 6b8f86aea1 noticed that acceptFulfillment could never be called, since the modifier checkBountiedInvariants would not return true if the original checkInvariants function didn't return true as well (which would be the case when the bounty has been fulfilled, and the contract is broken) 2017-05-23 19:14:05 -04:00
Gonçalo Sá 8257bcc529 Remove "Fulfilled" stage
There’s no need for a fulfilled stage now as there’s no state
transitions that would benefit from having this intermediary state.
2017-05-22 17:38:04 +01:00
Gonçalo Sá 062e2125c6 Pride is a sin! :) 2017-05-22 09:15:00 +01:00
Gonçalo Sá c2ac1e6dca negated every "require()" condition 2017-05-22 08:43:42 +01:00
Gonçalo Sá d6e4d2a7e5 created unpaidAmount()
promote reuse of code and turned a two-time used var into a constant
public function
2017-05-22 08:31:12 +01:00
Gonçalo Sá 6c916cd8fb vanity updates
move fallback function up in code
2017-05-22 07:55:53 +01:00
Gonçalo Sá f69ed3fc33 Prevent accidental "contributions" 2017-05-22 07:45:57 +01:00
Gonçalo Sá 08dc529e32 Renamed "reclaim" to "kill" 2017-05-22 07:36:16 +01:00
Gonçalo Sá 6832fc9df3 Added contribution event 2017-05-22 03:01:00 +01:00
Gonçalo Sá 57b3cd9fcc Merge branch 'feature/compiler-update' into develop 2017-05-21 21:04:44 +01:00
Gonçalo Sá 0b42a069d3 if condition deprecation
Exchanged for use of “require()”
2017-05-21 21:04:28 +01:00
Gonçalo Sá dc0da9f073 send() -> transfer()
Change all instances of “send()” for its safest counterpart “transfer()”
2017-05-21 21:03:32 +01:00
Gonçalo Sá 1b088295fa bump up pragma statement + change modifier if conditions for "require" functions 2017-05-21 20:58:32 +01:00
Gonçalo Sá 620ab82d7c correcting use of modifier 2017-05-21 20:37:44 +01:00
Gonçalo Sá 544454e067 Merge pull request #5 from ConsenSys/marks_changes
Cleaning up all uses of `canTransitionToState`
2017-05-21 20:20:59 +01:00
Gonçalo Sá 0165d103f7 Merge pull request #4 from ConsenSys/marks_changes
Marks changes
2017-05-21 19:57:15 +01:00
Gonçalo Sá 7b726e13d5 Cleaning up all uses of `canTransitionToState` 2017-05-21 19:49:09 +01:00
mbeylin 79a3c2a5d1 Merge pull request #3 from ConsenSys/marks_changes
removed canTransitionToState modifier
2017-05-17 14:00:22 -04:00
mbeylin 1922ab93d4 removed canTransitionToState modifier 2017-05-17 11:05:42 -04:00
Gonçalo Sá 543248f229 Merge pull request #1 from ConsenSys/marks_changes
Marks changes
2017-05-17 15:59:58 +01:00
mbeylin 89407312cb added a fallback function so anyone who wants to can contribute to funding a bounty 2017-05-16 21:06:18 -04:00
mbeylin 2a892b34ca removed the ability to auto-accept bounty fulfillments, fixed some of the state transitions that occur upon fulfillment, added a new function called lastFulfillment which determines if the bounty should stop being active (thereby allowing for new acceptances) 2017-05-16 20:54:34 -04:00
Gonçalo Sá ed164c3bca README fix + last direct commit (initing git-flow) 2017-05-16 23:34:48 +01:00
Gonçalo Sá 645c14adf7 Vanity updates 2017-05-02 17:13:47 +01:00
Gonçalo Sá c0b1f72ed2 CodeBugBounty fix of state change + Events rehaul + Add funds fix of state check 2017-05-02 13:37:30 +01:00
Gonçalo Sá 8f3ea760c7 fix wrong var in checkFulfillmentsNumber modifier 2017-05-02 13:25:00 +01:00
Gonçalo Sá a5e604232c Fixes to state machine check + unpaid fulfillments check 2017-05-02 12:27:57 +01:00
Gonçalo Sá 1820759007 fix error in new modifier 2017-05-02 09:43:33 +01:00
Gonçalo Sá a48ef36b42 Fixing State Logic and simplifying with total COP (Hybrid Functional Programming FTW!) 2017-05-02 09:42:45 +01:00
Gonçalo Sá c5f1eea04d Merge branch 'cop-refactoring' 2017-05-02 08:35:27 +01:00