Commit Graph
100 Commits
Author SHA1 Message Date
bumi 53dbc1e4ad Update README and npm scripts for hardhat 2022-04-25 10:09:15 -05:00
bumi d52f502fd5 Allow core users to create contributions 2022-02-03 22:07:17 +01:00
bumi 04fff0934d Explicit core check for the deployer account
The deployer account has the same rights as a core contributor. This is handled now explicitly in the addressIsCore function.
This allows us to run seeds and such from the deployer account.
2022-02-03 22:06:52 +01:00
bumi 8bb3f234c7 Get seeds working on RSK
we need to wait for the transactions to be mined otherwise we get a nonce error
2021-09-28 15:16:26 +02:00
bumi 15a08fdaec We need to use tx.origin to get the actual sender of the transaction (not an intermediary contract that talks to the other contract) 2021-09-28 15:10:05 +02:00
bumi 0756569dc7 FIx deployment script for RSK
we need to wait a bit more because RSK is slower and transactions must be confirmed
2021-09-28 13:19:50 +02:00
bumi 8a7858a0bb Cleanup and default dev deploy key (needed for NON rsk networks) 2021-09-26 19:27:03 +02:00
bumi 5e6d066e40 Cleanup 2021-09-26 19:26:03 +02:00
bumi c3bd2b88d4 Update dependencies 2021-09-26 19:25:57 +02:00
bumi ffd4a5aeaf Permissions 2021-09-26 19:25:43 +02:00
bumi 623cf6d6da Fix deprecation warninsg 2021-09-25 15:55:11 +02:00
bumi cc9cc53d0b Add RSK network 2021-07-08 11:27:49 +02:00
bumi 9bfe131cd5 Update ethers.js to support RSK deployments 2021-07-08 11:09:41 +02:00
bumi 8a962aea62 Cleanup package.json 2021-06-08 23:40:20 +02:00
bumi b81fc98740 No aragon app anymore :( 2021-06-08 23:31:25 +02:00
bumi 5d4c9ba403 bye truffle migration 2021-06-08 23:30:41 +02:00
bumi f5ca44d779 ByeBye apps 2021-06-08 23:30:27 +02:00
bumi dd70bf77d5 Cleanup scripts 2021-06-08 16:17:56 +02:00
bumi 63e8ce1e3f Extend hre with a kredits instance 2021-06-08 16:17:34 +02:00
bumi a626409221 Move contracts to root level for hardhart usage
byebye aragon apps
2021-06-08 15:45:23 +02:00
bumi 1425c3664a Hello hardhat 2021-06-02 16:36:49 +02:00
bumi 357698db02 Deployment details 2021-02-19 10:24:54 +01:00
bumi 0df7930e06 Get it running 2020-12-22 12:28:34 +01:00
bumi eebc0db02b Add script to count contributions between a certain block timeframe 2020-12-16 17:19:31 +01:00
bumi b22d16e61e We do not need the appIds in the reimbursement app
this might make it easier to deploy?
2020-12-01 13:27:39 +01:00
bumi 6bc6bcb7f6 We don't use those helpers right now. but maybe later? 2020-12-01 12:54:28 +01:00
bumi 9df58b7f9a Fix seeds 2020-12-01 12:51:33 +01:00
bumi c83a560e3b merge master 2020-12-01 10:39:01 +01:00
bumi eadca6904a Rename contributor to recipient
And remove addedBy entry.
2020-12-01 10:33:09 +01:00
bumi 8f0d7e5196 6.0.0 2020-07-17 13:22:59 +02:00
bumi 4add0c7d96 package-lock 2020-07-17 13:22:24 +02:00
bumiandGitHub fbd82a442e Merge pull request #200 from 67P/ethers5
Update to ethers 5
2020-07-07 16:59:40 +02:00
bumi c39fe406d0 Fix deprecation 2020-06-29 23:49:46 +02:00
bumi a609d921aa Remove accidentally added local DAO addresses 2020-06-29 23:49:03 +02:00
bumi 23d3dd3a80 Adjust API for new ethers v5 API
see issue for details: https://github.com/ethers-io/ethers.js/issues/920#issuecomment-650836642
2020-06-29 17:23:08 +02:00
bumi bc38dcb136 Copy contract data into new object to avoid object is not extensible error
It seems the new ethers.js version returns contract data as a non-
extensible object. We have to clone it before adding the IPFS data.
2020-06-27 20:39:23 +02:00
bumi c2dcedfe58 Update to ethers 5 2020-06-24 01:20:04 +02:00
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
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