status-im
/
liquid-funding
mirror of https://github.com/status-im/liquid-funding.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
295 Commits 12 Branches 1 Tag 31 MiB
Commit Graph

295 Commits

Author SHA1 Message Date
Arthur Lunn 7c2faf5e44
Merge branch 'master' into quazia-comments 2017-11-18 17:53:57 +00:00
Jordi Baylina 5cce6663f1
Merge pull request #46 from Giveth/whitelist 
Whitelist plugins
 2017-11-17 16:20:58 +01:00
perissology e2083f4f12 fix tests after web3 update 2017-11-16 15:30:29 -08:00
perissology 8b629d3bd7 add plugin whitelist 
fixes #33
 2017-11-16 15:15:32 -08:00
Jordi Baylina 84be690f03
Merge pull request #44 from Giveth/confirmPayment 
remove isProjectCanceled check from confirmPayment
 2017-11-15 21:18:21 +01:00
Arthur L Lunn 4edb86cf19 Add build files 2017-11-10 18:54:44 +00:00
Arthur L Lunn 8ab1ce5066 Fix test issues and merge from master 2017-11-10 18:54:27 +00:00
perissology 5d15fc6f62 preserve delegationChain on delegation veto 2017-11-10 08:39:58 -08:00
perissology 1ed9c88a14 Merge branch 'master' into veto_delegation 2017-11-10 07:33:12 -08:00
perissology 7f36ec4030 fix typo from conflicts 2017-11-09 12:12:19 -08:00
perissology ca1e429724
Merge branch 'master' into confirmPayment 2017-11-09 20:11:01 +00:00
perissology a82cd3a5e5
Merge pull request #34 from Giveth/tests 
more tests
 2017-11-09 20:09:47 +00:00
perissology 7909aa3977 remove isProjectCanceled check from confirmPayment 2017-11-09 11:11:11 -08:00
perissology d4ca1669d4 Merge remote-tracking branch 'origin/master' into tests 2017-11-04 07:19:18 -05:00
Arthur L Lunn ebe7c823a2 Fix test issues from LPVault name change 2017-11-01 19:41:23 -04:00
Arthur L Lunn b2e89ed954 fix issues with Vault naming 2017-11-01 17:22:41 -04:00
Arthur L Lunn 0b77977f90 fix errors with docstrings 2017-11-01 17:03:03 -04:00
Jordi Baylina 243fa40084
Merge pull request #39 from Alonski/linting 
Add Solium Linting
 2017-11-01 04:46:12 -05:00
Jordi Baylina 09110afc2b
Merge pull request #31 from Giveth/isProjectCanceled 
use isProjectCanceled to check for canceled project
 2017-11-01 04:40:21 -05:00
Jordi Baylina d198ac0d74
Merge pull request #30 from Giveth/cancelPledge 
cancel pledge bugs
Good catch!
 2017-11-01 04:37:51 -05:00
Jordi Baylina 966fdafce0
Merge pull request #24 from Giveth/vault 
call transfer last
 2017-11-01 04:32:51 -05:00
Jordi Baylina 5b53c5f4b9
Merge pull request #37 from Giveth/bit_manipulation 
don't need to use bit manipulation in mNormalizePledge
 2017-11-01 04:31:48 -05:00
Arthur L Lunn 7982f9ca1b change Vault to LPVault and comment 2017-10-31 17:00:34 -04:00
Arthur L Lunn ee8e2b777b spellcheck comments 2017-10-28 04:27:47 -04:00
Arthur L Lunn 77efe8ca90 comment LiquidPledgineBase 2017-10-27 15:09:55 -04:00
Arthur L Lunn f7e1618093 Add comments to LiquidPledgingMock 2017-10-27 10:38:25 -04:00
Alon Bukai 355882de69 Add Solium Linting 2017-10-26 08:45:36 +03:00
Alon Bukai 0d81506bfa Added Public Modifiers 2017-10-25 20:37:21 +03:00
perissology 8eadb054ca added tests for normalizePledge 2017-10-24 10:59:10 -07:00
perissology 9cdd35fc2c don't need to use bit manipulation in mNormalizePledge 2017-10-24 10:43:29 -07:00
perissology 1729939374 use setMockedTime in longest commitTime test 2017-10-24 10:07:12 -07:00
perissology 31e511393d rename DelegationChain test name 2017-10-24 09:16:59 -07:00
perissology c94caf9160 replace multiple withdraw calls with mWithdraw 2017-10-24 08:34:06 -07:00
alf40k 5dacc27943 Add copyrights and finish commenting plugin interface 2017-10-24 00:09:56 -04:00
alf40k cce055d31b Finish liquidPledging comments 2017-10-23 23:26:31 -04:00
perissology 423f61ff51 added test for maxCommit time in delegation chain 2017-10-23 17:02:47 -07:00
perissology fa996a43b9 merge VetoDelegation & DelegationChain tests 2017-10-23 16:17:39 -07:00
alf40k 9d5ea4fe7f comment all private methods 2017-10-23 17:40:51 -04:00
perissology b5b907bfca added test 2017-10-23 14:26:38 -07:00
perissology 6d8c259f1d added tests for delegations 2017-10-23 14:25:06 -07:00
alf40k 8eb3a6930d comment transferOwnershipToGiver 2017-10-22 20:50:48 -04:00
alf40k 3a8e906ee9 comment transferOwnershipToProject 2017-10-22 20:43:28 -04:00
alf40k 5cebf72fb3 Shorten Line Length 2017-10-22 20:04:58 -04:00
alf40k 456f46a5ab Resolve mutl pledge function comment issues 2017-10-19 18:40:37 -04:00
alf40k e7ae5cc61d comment multi pledge methods 2017-10-19 17:49:53 -04:00
perissology 18984a26ff use isProjectCanceled to check for canceled project 2017-10-19 12:14:31 -07:00
perissology 34adef5505 cancelPledge getOldestPledgeNotCanceled 
This will eliminate the bug when pledge.oldPledge is a canceled project
w/ a plugin and the plugin rejects transfers when canceled. This would
prevent the pledge from being canceled.

We address this by transfering the pledge amount to the
oldestPledgeNotCanceled.
 2017-10-19 10:32:06 -07:00
perissology 420d07d161 prevent cancelPledge transfer to 0 note 2017-10-19 09:49:16 -07:00
ojones 66388c4e9e Merge pull request #29 from ojones/master 
readme header png
 2017-10-17 23:03:35 -07:00
ojones 3fe03bca0e readme header png 2017-10-17 22:56:43 -07:00