kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity
420 Commits 22 Branches 22 Tags
e2d5d704ce73da0eb8f468d515b687bf690f5822
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bastiandGitHub 48ff304861 Merge pull request #166 from 67P/dev/remove_yarn_lockfile 
Remove yarn lockfiles
 2019-08-27 12:34:29 +02:00
basti 580d6e8f51 Remove yarn lockfiles 2019-08-09 19:03:29 +02:00
bastiandGitHub a572f02b2e Merge pull request #164 from 67P/chore/remove-cached-artifacts 
Remove cached artifacts
 2019-08-09 19:00:21 +02:00
basti abd4caa336 Document how to configure block time for Ganache 2019-08-09 18:58:20 +02:00
bastiandGitHub ddeeb5ffd7 Merge pull request #162 from 67P/dev/aragon_truffle 
Remove Aragon CLI, document system deps
 2019-08-09 18:38:40 +02:00
basti ae71691c5b Install Aragon CLI and Truffle on Travis 2019-08-09 18:26:38 +02:00
basti 819fbc547a Add contract publish options 
This removes most of the features we don't need/want and minimizes
prompts during the bootstrap process.
 2019-08-09 18:18:36 +02:00
basti 7236b04b4b Remove Aragon CLI, document system deps 
In order to prevent regular issues with the notoriously npm-issue-ridden
Aragon CLI module, this removes it as a direct dependency and requires
it to be installed as a system dependency.

Also adds Truffle as a system dependency to the docs (which was missing
before).
 2019-08-09 18:04:21 +02:00
bastiandGitHub f746470cf6 Merge pull request #161 from 67P/fix_typos 
Fix a few typos in the README
 2019-08-07 16:42:01 +02:00
bastiandGitHub 3c08e3ecfc Merge pull request #160 from 67P/bugfix/packages-install-scripts 
Fix package script command deploy:kit
 2019-08-04 19:42:42 +02:00
bastiandGitHub 4aa5f3aa89 Merge pull request #151 from 67P/chore/remove-ipfs-pinner 
Remove IPFS pinner
 2019-07-03 12:50:59 +02:00
bastiandGitHub 16141ed482 Merge pull request #136 from 67P/feature/ipfs-pinner 
Add IPFS pinning script
 2019-07-01 13:06:45 +02:00
bastiandbumi 03b9f69d22 Fix compile command 
The Aragon one is failing now, but just using the underlying Truffle
command works. So it appears to be the passing of the argument in aragon
that's broken.

Co-authored-by: Michael Bumann <hello@michaelbumann.com>
 2019-07-01 12:24:56 +02:00
bastiandbumi 9906fde7ef Use postshrinkwrap instead of postinstall 
`postinstall` is executed before package-lock.json is written to disk.

https://github.com/npm/npm/issues/18798
 2019-06-19 00:52:48 +02:00
bastiandbumi c7e1f118a6 Add postinstall lockfile fix 
https://github.com/67P/kredits-contracts/pull/140
 2019-06-19 00:52:47 +02:00
basti 9fd9dbc1b5 Handle errors in IPFS pin script 2019-06-13 18:31:47 +02:00
basti b7d87cd8f2 Ignore scripts folder in eslint 
Lots of undef etc. due to the scripts being piped through truffle
 2019-06-13 17:39:03 +02:00
basti 6c8491e67b Handle errors in seed funding 2019-06-13 17:38:34 +02:00
basti 2623e71055 Update deprecated functions in seeds 2019-06-13 17:38:00 +02:00
basti ed0d420fd5 Fix linter issues in seeds 2019-06-13 17:37:36 +02:00
basti 36666fd417 Update package lockfile 2019-06-12 16:07:38 +02:00
bastiandGitHub 810a2eb5fd Merge pull request #134 from 67P/chore/update-dependencies 
Update dependencies
 2019-06-10 13:19:29 +02:00
bastiandGitHub e55a209343 Merge pull request #133 from 67P/feature/list-totals 
Print total unconfirmed and confirmed contribution kredits
 2019-06-09 13:58:42 +02:00
bastiandGitHub 17bc4e7d8f Merge pull request #121 from 67P/refactor/amounts_vs_counts 
Improve totalKreditsEarned
 2019-06-09 13:57:44 +02:00
bastiandGitHub 4919605664 Merge pull request #130 from 67P/feature/kredits-kit-wrapper 
Add JS wrapper for Kit contract
 2019-06-09 13:56:32 +02:00
bastiandGitHub f639e3aa19 Add pre-commit hook and setup script (#129) 
Add pre-commit hook and setup script

Runs the appropriate linter on staged files before committing.
 2019-06-09 13:53:40 +02:00
basti a3590d7c16 Update kosmos-schemas 
Includes the new "special" contribution kind, as discussed in our last
call.
 2019-05-10 13:14:56 +02:00
bastiandGitHub 07a5ca847d Merge pull request #125 from 67P/bugfix/pagination 
Fix page number calculation for zero records
 2019-05-07 17:12:16 +02:00
bastiGitHubbumi
 		e7e8744ad2 Update lib/contracts/proposal.js 
Co-Authored-By: bumi <hello@michaelbumann.com>
 2019-05-01 18:06:55 +00:00
bastiGitHubbumi
 		d2198dca61 Update lib/contracts/contribution.js 
Co-Authored-By: bumi <hello@michaelbumann.com>
 2019-05-01 18:06:43 +00:00
basti a1f51428d0 Add script for vetoing via console 2019-04-28 15:09:18 +01:00
basti 555cb53c78 Improve totalKreditsEarned 
* Use a more reasonable size of integer
* Use better variable names (count != amount, balance != count)
 2019-04-27 21:01:51 +01:00
bastiandGitHub 3568d3c141 Merge pull request #120 from 67P/bugfix/fix-core-permissions 
Fix canPerform method
 2019-04-25 21:17:37 +01:00
bastiandGitHub db566a581f Merge pull request #119 from 67P/bugfix/fix-kit-deployment 
Fix apps lookup
 2019-04-25 21:10:04 +01:00
bastiGitHubbumi
 		5c375f764f Update scripts/deploy-kit.js 
Co-Authored-By: bumi <hello@michaelbumann.com>
 2019-04-25 20:05:03 +00:00
bastiandGitHub a80dfee5c5 Merge pull request #116 from 67P/deployments/balance-update 
Release/deployment notes for latest contract updates on Rinkeby
 2019-04-24 17:03:48 +01:00
basti 8539b56a48 5.3.0 2019-04-24 14:22:53 +01:00
bastiandGitHub f59c37827a Merge pull request #108 from 67P/feature/kredits-formatter 
Add kredits-formatter and additionally format balance
 2019-04-24 14:20:44 +01:00
basti 6b2ac15f56 Improve error handling for list-contributors script 2019-04-24 13:46:27 +01:00
basti 359989f235 Fix function name for total kredits issued/earned 2019-04-24 13:45:56 +01:00
basti 5894f6323b Add Gitea username to contributor seeds 2019-04-24 13:43:46 +01:00
basti 09b78e1e8f Add Gitea site/username to contributor serializer 2019-04-23 20:28:56 +01:00
basti 542ebaf3f3 5.2.0 2019-04-23 13:52:46 +01:00
basti d82ffba75e Update ABI 2019-04-23 13:52:37 +01:00
bastiandGitHub bdb2cee0c4 Merge pull request #110 from 67P/feature/contribution-balances 
Add contract calls for total contribution balances
 2019-04-23 13:47:50 +01:00
bastiandGitHub 3a97983540 Merge pull request #111 from 67P/feature/contributor-schema-validation 
Add Contributor validation against JSON schema
 2019-04-20 08:47:49 +01:00
basti 1d771c43e8 Handle errors in contributor list script 2019-04-19 12:02:28 +01:00
basti 2a1ae117e8 5.1.1 2019-04-16 12:50:07 +01:00
basti 80ad9db630 5.1.0 2019-04-13 12:41:49 +01:00
bastiandGitHub 1b5f7ff95d Merge pull request #93 from 67P/deployments/weltempfaenger-release 
Production release to rinkeby
 2019-04-13 11:07:58 +01:00
basti 952b5153fd Validate proposed contributions 2019-04-11 13:46:42 +02:00
basti d953141f52 Refactor contribution serializer and validation 2019-04-11 13:05:40 +02:00
basti aa57d7c70b Adjust seeds for new requirements 2019-04-11 11:02:15 +02:00
basti 4c0bb879e8 Show IPFS hash in list script output 2019-04-11 11:01:45 +02:00
basti 9c5a517fb9 5.0.0 2019-04-11 08:45:49 +02:00
bastiandGitHub b00ddda312 Merge pull request #92 from 67P/feature/contribution_schema 
Validate contribution docs against schema
 2019-04-11 08:40:38 +02:00
basti 130e2a7797 Validate contribution docs against schema 
Currently requires an open PR branch for the schemas, which is adding
date and time for contributions.

refs #30
 2019-04-10 18:37:02 +02:00
bastiandGitHub b9c171884b Merge pull request #91 from 67P/feature/store-balance-as-wei 
Store kredits tokens as wei with 18 decimals
 2019-04-10 15:51:36 +02:00
bastiandGitHub 1aae62e139 Merge pull request #88 from 67P/bugfix/confirmed-contributions 
Fix confirmed contribution check
 2019-04-09 22:36:37 +02:00
basti 6778b9060f 4.0.2 2019-04-09 12:47:59 +02:00
basti 4d36f78824 4.0.1 2019-04-09 12:47:37 +02:00
bastiandGitHub 98ecf28262 Merge pull request #87 from 67P/dev/dependency_install 
Rename postinstall script
 2019-04-09 12:45:41 +02:00
basti f5564fa923 Formatting, whitespace 2019-04-09 12:45:20 +02:00
basti 096a9f3cea Update README for install-all script 2019-04-09 12:45:09 +02:00
bastiandGitHub 3d24835908 Merge pull request #86 from 67P/dev/bootstrap 
Don't run `npm install` on bootstrap
 2019-04-09 09:50:51 +02:00
basti 8cbef8458d Rename postinstall script 
Prevents it being run when contracts are installed as dependency.
 2019-04-09 09:48:00 +02:00
basti dfe38e7d21 Don't run npm install on bootstrap 
When one wants to install, they can install. When one wants to
bootstrap, they should be able to only bootstrap.
 2019-04-09 08:44:56 +02:00
basti 377560805f Fix contributor ID in seeds 
We have one contributor less, after having removed the initial dummy
account recently.
 2019-04-09 08:43:13 +02:00
basti 26c2710149 Improve list-contributions script 
* Improve sort order of table columns
* Print if the contribution is confirmed
* Log error if something goes wrong
 2019-04-06 17:56:48 +02:00
bastiandGitHub 7eb1fedb42 Merge pull request #76 from 67P/features/dynamic-core-flag 
Dynamic function to test for core contributor flag
 2019-04-06 15:19:01 +02:00
bastiandGitHub cbfe39f804 Merge pull request #78 from 67P/feature/veto-period 
Set contribution veto period to 1 week
 2019-04-06 00:30:30 +02:00
basti 93e0b30b35 4.0.0 2019-04-05 15:44:51 +02:00
basti 896db5e047 Update abi 2019-04-04 23:16:23 +02:00
basti d507d7b562 Enable all seeds again 2019-04-04 23:16:01 +02:00
basti 40c5d2a275 Merge branch 'master' into feature/contribution_owner 2019-04-04 23:12:16 +02:00
basti a049f2eedb Adjust proposals for format changes 2019-04-04 23:11:43 +02:00
bastiandGitHub b68b037000 Merge pull request #74 from 67P/chore/npm-scripts 
Add some helpers to reset a fresh DAO and upgrade an app
 2019-04-04 23:11:12 +02:00
basti 181e6f3c23 Fix/refactor contribution wrapper 2019-04-04 22:56:06 +02:00
basti 19556349f6 Fix syntax error 2019-04-04 22:30:27 +02:00
basti e4c3d9a468 Update abi 2019-04-04 16:28:34 +02:00
basti 5b49f82544 Adjust wrapper and scripts for contract changes 2019-04-04 16:24:37 +02:00
basti 6088f30cd8 Use smaller numbers for contributor ID 
2.2 billion contributors should be enough.
 2019-04-04 16:01:08 +02:00
basti f1e2c65b9e Use smaller numbers where appropriate 2019-04-04 15:28:18 +02:00
basti 786f38cfb7 Print errors in seed contract calls 2019-04-04 15:25:31 +02:00
basti 197a31b9e1 Remove whitespace 2019-04-04 14:47:25 +02:00
basti 20acfc70e3 Use ID instead of address for contribution owner 2019-04-04 14:43:38 +02:00
basti e0ff29d1c9 Remove unnecessary space chars 2019-04-04 11:38:18 +02:00
basti 0ce62839e9 Update seeds 
Use more realistic data, add more contributions
 2019-04-04 11:32:46 +02:00
bastiandGitHub cc2c9a7368 Merge pull request #70 from 67P/feature/claim-contribution-in-seeds 
Update seeds
 2019-04-03 21:50:43 +02:00
bastiandGitHub 1abfc5a265 Merge pull request #69 from 67P/fix/add-contributor-permissions 
Fix permissions to manage contributors
 2019-04-03 21:50:19 +02:00
bastiandGitHub 350dadec4d Merge pull request #68 from 67P/update-ipfs-package 
Update ipfs package
 2019-04-03 21:16:22 +02:00
bastiandGitHub 92da07dca2 Merge pull request #67 from 67P/feature/contributor-balance-1 
Add balance when loading contributor
 2019-04-03 20:22:50 +02:00
basti ed3e5dd4c4 Allow seed tx to fail 
This allows for running seeds multiple times, e.g. after adding new
ones.
 2019-04-03 11:41:55 +02:00
basti bd39d0f126 Use new address for raucao seed 2019-04-03 11:41:45 +02:00
bastiandGitHub 4c8ee69664 Merge pull request #65 from 67P/fix/ethersjs-namehash 
Use namehash from ethers.utils
 2019-04-03 11:39:35 +02:00
bastiandGitHub eae8967322 Merge pull request #63 from 67P/fix/contriutor-permissions 
Fix contributor oracle permission auth
 2019-04-03 11:37:10 +02:00
bastiandGitHub f40cc1d8ff Merge pull request #62 from 67P/aragonos 
Build on aragonOS
 2019-04-02 21:36:36 +02:00
basti adb7122a28 Add helper script for updating local address file 
Can be run after starting the devchain, so that all local truffle
scripts work with the new network ID.
 2019-04-02 17:35:28 +02:00
basti a24f80d44f Change addresses 2019-04-01 14:04:11 +02:00
basti 9512ba4334 Update contract addresses 2019-04-01 11:19:30 +02:00