kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity
458 Commits 22 Branches 22 Tags
15b47dbc42ecca20252dcff5e468b0e7ff537065
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bumi 2c567fa71a Use contributorId instead or address for reimbursements 2020-06-12 00:29:59 +02:00
bumi 9b4a95f375 use const for not reassigned variable 2020-05-30 14:02:50 +02:00
bumi 687f87f43b cleanup address files 2020-05-30 14:02:29 +02:00
bumi 7fdeb78617 Support multiple expenses in one reimburesement 2020-05-29 18:47:49 +02:00
bumi 19f212f283 Cleanup 
we do not support claiming/withdrawal yet.
 2020-05-29 17:25:27 +02:00
bumi 1f248812a7 Reimbursement.getReimbursement vs. Reimbursement.get 2020-05-29 15:12:57 +02:00
bumiGitHubbasti
 		3f8407fa02 Update apps/reimbursement/contracts/Reimbursement.sol 
Co-authored-by: Sebastian Kippe <sebastian@kip.pe>
 2020-05-29 11:31:51 +02:00
bumi a0b0183beb Add Reimbursement app 2020-05-29 10:46:55 +02:00
bumiandGitHub 2b99593699 Merge pull request #196 from 67P/chore/dependency-updates 
Chore/dependency updates
 2020-05-27 16:22:40 +02:00
bumi 606350eb5e Update solc 
our contracts still use an older version, but I guess it is good to have
the latest solc package
 2020-05-27 10:53:31 +02:00
bumi a330a8eedf npm upgrade 2020-05-27 10:46:41 +02:00
bumi 3c72fa3a8b run npm upgrade in every app 
are those package-lock.json there actually used?
 2020-05-27 10:31:12 +02:00
bumi a4ef2398be update dependencies 2020-05-27 10:06:06 +02:00
bumi 5044d8fe41 fix syntax error 2020-04-15 20:44:13 +02:00
bumi 3c49c688d2 Add missing dev dependencies and update dependencies 2020-04-15 20:43:46 +02:00
bumi 47f59126a7 5.5.0 2020-03-01 12:46:22 +01:00
bumiandGitHub 2ce5d925d0 Merge pull request #182 from 67P/chore/update_dependencies 
WIP: Fix Aragon breaking changes; update dependencies
 2020-02-20 11:42:04 +00:00
bumi 3db89b0fa3 Refactor kredits related configuration in arapp.json 
we use an environment specific entry for the daoAddress.
Locally we deploy our own, but for rinkeby and other public networks
we use the official entries.
To make deployments easy we store the address in the arapp.json
 2020-02-10 15:55:16 +01:00
bumi 190d3b77d5 Update tests 
getContract now seems to return a Promise
 2020-02-10 14:59:22 +01:00
bumi b7eac4202c Adjust deploy script and readme for updates 2020-02-10 14:30:03 +01:00
bumi aba4a23104 Fixes & linting 2019-09-17 18:30:19 +02:00
bumi 13ed02e134 Add support for zoom profils 
This adds an accessor for the zoom_name to the contributor profile.
Doing this also removes general support for preserviing the contributor
accounts array as this was buggy and caused accounts to be added
multiple times.
 2019-09-17 17:24:35 +02:00
bumiandGitHub 1c1a318ae6 Merge pull request #165 from 67P/docs/blocktime 
Document how to configure block time for Ganache
 2019-08-09 22:10:06 +00:00
bumi f1941eb6b8 Remove cached artifacts 
Thos should be generated on every contract app deployment and thus don't need to
be in the repo.
We also don't have those for the other contract apps.
 2019-08-09 18:46:36 +02:00
bumiandGitHub 4ae17aa36f Merge pull request #156 from haythem96/refactor-get-contract 
Refactor get apps contract functions
 2019-07-22 06:54:05 +00:00
bumiandGitHub d92ad83379 Merge pull request #155 from 67P/bugfix/send-for-new-web3 
Fix send-funds script to use new web3 API
 2019-07-19 09:11:55 +00:00
bumi fa3e99d404 Fix send-funds script to use new web3 API 
The API changed with the recent aragon/truffle update.
 2019-07-18 16:25:06 +02:00
bumi 2316e8f15a Remove IPFS pinner 
The pinner now lives in its own npm package
 2019-07-02 19:09:26 +02:00
bumi 87a468bc91 5.4.0 2019-07-02 16:27:26 +02:00
bumiandGitHub 0734acbcbe Merge pull request #149 from 67P/feature/support-ipfs-gateway 
Add support to use IPFS gateway to read ipfs data
 2019-07-01 15:41:07 +00:00
bumi a45c8d14be Downgrade IPFS package 
The new version uses generators which breaks the build on kredits-web.
 2019-07-01 16:12:22 +02:00
bumi 61fe9add1b Add support to use IPFS gateway to read ipfs data 
This makes caching of IPFS documents easier. Browsers should cache those
by default
 2019-07-01 15:53:18 +02:00
bumiandGitHub 01ef37fd39 Merge pull request #147 from 67P/bugfix/compile_all 
Fix compile command
 2019-07-01 10:30:41 +00:00
bumiandGitHub dd76ebdc8d Merge pull request #141 from haythem96/setup-tests 
Solidity test setup
 2019-06-26 15:05:23 +00:00
bumi d653b3715f Update package-lock 2019-06-19 14:10:44 +02:00
bumiandGitHub a05e2c75f3 Merge pull request #142 from 67P/chore/update-dependencies-2 
Chore/update aragon-cli dependencies
 2019-06-19 08:39:06 +00:00
bumi 124287b977 Updated latest package-json 2019-06-19 01:00:53 +02:00
bumi 1702c22084 Make sure fix lockfile uses the correct file path 2019-06-19 00:52:47 +02:00
bumi 32a123a825 Default to open.aragonpm.eth 
it is now also available on the devchain
 2019-06-19 00:52:47 +02:00
bumi ac83573438 I don't know why this is needed but it fixes an npm issue 
if install fails node scripts/fix-package-lock.js might help
 2019-06-19 00:52:47 +02:00
bumi 77c6c11800 Remove npm cache and use LTS node on travis 2019-06-19 00:52:05 +02:00
bumi 86bbe49c0b Fix seeds script to support new web3 version 2019-06-13 18:39:25 +02:00
bumi d5322530c3 Update aragon CLI to latest version 2019-06-13 18:37:33 +02:00
bumiandGitHub 011d85447f Merge pull request #138 from 67P/dev/seeds 
Various small seed/script improvements
 2019-06-13 16:36:38 +00:00
bumiandGitHub 231d6e2477 Merge pull request #135 from 67P/feature/expose-available-networks 
Expose available network IDs
 2019-06-12 07:57:31 +00:00
bumi 6d6c6056f0 Refactor IPFS pinner 2019-06-12 01:08:07 +02:00
bumi b09c2830c8 Make IPFS node configurable 2019-06-11 23:45:27 +02:00
bumi fc5a41123a Add IPFS pinning script 
This script loads the IPFS hashes for contributors and contributions and
pins them on the connected IPFS node.

usage:

    $ node script/ipfs-pinner.js

    $ ETH_RPC_URL=http://localhost:7547 APM_DOMAIN=aragonpm.eth node scripts/ipfs.pinner.js
 2019-06-11 21:48:50 +02:00
bumi 107654ecca Expose available network IDs 
This exposes the network IDs on which kredits is deployed. Helpful to
check if the used network is supported.
 2019-06-11 15:45:14 +02:00
bumi 06a4e2173a Try npm instead of yarn on travis 
There is some strange error with yarn: https://travis-ci.org/67P/kredits-contracts/builds/543186831
 2019-06-10 12:59:02 +02:00
bumi 84b4461ba6 Update dependencies 2019-06-08 19:05:35 +02:00
bumi c4f8e9278e Use consitently uint32 for amounts 2019-06-08 17:56:50 +02:00
bumi 00905eb269 Update ABIs 2019-06-08 17:53:26 +02:00
bumi 6a64842415 Only count not-vetoed contributions for total balances 2019-06-08 17:49:24 +02:00
bumi 055d8bc0ef Print total unconfirmed and confirmed contribution kredits 2019-06-08 17:42:20 +02:00
bumiandGitHub 91779ccd03 Merge pull request #131 from 67P/feature/claim-contribution-script 
Add script to claim contributions for one contributor
 2019-05-21 11:29:56 +00:00
bumi 516b8b31ac Add script to claim contributions for one contributor 2019-05-20 13:48:15 +02:00
bumi ccd52f6ee5 Cleanup 2019-05-17 18:24:55 +02:00
bumi ffff09ab23 Add contract address accessor 2019-05-17 15:56:24 +02:00
bumi 3df0831d9b Cleanup whitespace 2019-05-17 15:56:02 +02:00
bumi 27a746261c Add JS wrapper for kredits kit 
This makes it easier to deploy new DAOs and the deploy script is less
dependent on truffle
 2019-05-17 15:54:52 +02:00
bumiandGitHub 345b6bde82 Merge pull request #127 from 67P/feature/allow-setting-contributor-accounts 
Allow setting any contributor accounts
 2019-05-17 08:42:43 +00:00
bumiandGitHub a86ea08bdf Merge pull request #128 from 67P/feature/simple-init 
Add helper to initialize a new instance with provider
 2019-05-17 07:37:10 +00:00
bumi e20bda73fb Remove not needed network check 
We default to localhost anyway
 2019-05-17 09:17:10 +02:00
bumi 4c64aa7c2a linting 2019-05-14 12:03:29 +02:00
bumi cf43bf9487 Linting 2019-05-14 11:32:42 +02:00
bumi 1a227ba67c Linting 2019-05-14 11:31:33 +02:00
bumi df7536589d Add helper to initialize a new instance with provider 
So far we always had to initialze a provider and signer and pass those
to the kredits constructor.
This helper makes it easier to initialize a default ethers provider and
a default signer.
 2019-05-14 11:25:21 +02:00
bumiGitHubbasti
 		f0fe62f6d7 Apply suggestions from code review 
Co-Authored-By: Sebastian Kippe <sebastian@kip.pe>
 2019-05-14 09:18:23 +00:00
bumi 66fc992291 Allow setting any contributor accounts 
This allows to pass in an account object when creating or updating a
contribtor.
 2019-05-14 11:06:49 +02:00
bumiandGitHub 37ce2fddde Merge pull request #124 from 67P/bugfix/fix-me-1 
Fix util import
 2019-05-04 08:40:58 +00:00
bumi 3a43284557 Fix page number calculation for zero records 
So far it returned 0 because of those in range checks which both
applied because numberOfPages is 0 if we have no record.
 2019-05-04 01:34:05 +02:00
bumi 572848c04a Fix util import 2019-05-04 01:09:22 +02:00
bumiandGitHub b6ce9dcfc8 Merge pull request #118 from 67P/deprecate/old-add-methods 
Deprecate old add* methods
 2019-05-01 18:12:18 +00:00
bumiandGitHub f9f2ef234e Merge pull request #122 from 67P/feature/veto_script 
Add script for vetoing via console
 2019-05-01 18:05:37 +00:00
bumi ad74d30aa7 Contributor canPerform fix deployment 2019-04-25 22:25:38 +02:00
bumi c69ebd0a62 Fix canPerform method 
Even if the variable is not used and the linter might complain we have
to have that parameter in the signature. otherwise the method is not
found and can not be called.
 2019-04-25 22:06:40 +02:00
bumi b04d572b9a Fix apps lookup 
We use the directories in ./apps to load available app names.
For this we need to make sure that we only use directories.
 2019-04-25 16:45:39 +02:00
bumiandGitHub d643e5842c Merge pull request #97 from 67P/chore/linter 
Add linter and travis.yml
 2019-04-24 18:28:32 +00:00
bumi a87d5326bf Oh my package-lock 2019-04-24 20:17:03 +02:00
bumi 4649de24c8 Deploy notes for latest contributor and contribution deployment 2019-04-24 17:32:58 +02:00
bumiandGitHub 58db57ee45 Merge branch 'master' into feature/kredits-formatter 2019-04-24 13:10:48 +00:00
bumiandGitHub b64a7ca299 Merge pull request #113 from 67P/feature/gitea_site 
Add Gitea site/username to serializer and seeds
 2019-04-24 12:58:44 +00:00
bumiandGitHub 6f09ca8d13 Merge pull request #114 from 67P/chore/scripts 
Improve/fix scripts
 2019-04-24 12:57:43 +00:00
bumi 6f53c8097e Wrap anything that could break in the try/catch block 2019-04-24 14:55:35 +02:00
bumiandGitHub 48c8f6b9b3 Merge branch 'master' into feature/kredits-formatter 2019-04-23 12:56:55 +00:00
bumiandGitHub cd45ce260f Merge pull request #112 from 67P/feature/update-contributor-profile 
Update contributor profile
 2019-04-20 09:22:31 +00:00
bumi 9714926e11 Add function to update contributor profile to wrapper 
The function updates the contributor profile,
adds the new profile to IPFS and does the contract call to update
the profile hash
 2019-04-20 02:17:38 +02:00
bumi 59614201b5 Ups... 2019-04-20 02:15:53 +02:00
bumi e591742e40 Add Contributor validation against JSON schema 
based on the Contribution validation.
 2019-04-20 01:10:46 +02:00
bumi 791190f5e7 Cleanup promise call 2019-04-20 00:30:20 +02:00
bumi 24b66daf2a Update ABI 2019-04-19 14:16:40 +02:00
bumi ad034d7712 Naming is hard 2019-04-19 14:15:30 +02:00
bumi 375d8f3275 Cleanup 2019-04-19 13:34:39 +02:00
bumiandGitHub 80dc787971 Merge pull request #109 from 67P/dev/list_contributors_error_handling 
Handle errors in contributor list script
 2019-04-19 11:22:38 +00:00
bumi 7967dc26f2 Update ABIs 2019-04-19 13:20:25 +02:00
bumi c248725cc1 Add balances to getContributorById call 2019-04-19 13:19:55 +02:00
bumi 59135bf312 Add contract calls for total contribution balances 
Those methods return the total kredits amounts of contribtions.
 2019-04-19 13:06:36 +02:00
bumi 3cb94fb660 Add kredits-formatter and additionally format balance 
This adds a `balanceInt` value to the contributor data that has the
token balance formatted as full Kredits. (similar to Ether)
 2019-04-19 11:57:35 +02:00
bumiandGitHub 5820d71b2c Merge pull request #96 from 67P/feature/pagination 
Add pagination for .all methods
 2019-04-17 13:53:17 +00:00