Compare commits
2 Commits
chore/upda
...
apm-hack
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d0abe9027 | |||
| 4fb8f1dc86 |
@@ -1 +0,0 @@
|
||||
/scripts/
|
||||
32
.eslintrc.js
32
.eslintrc.js
@@ -1,32 +0,0 @@
|
||||
module.exports = {
|
||||
'env': {
|
||||
'browser': true,
|
||||
'es6': true,
|
||||
'node': true
|
||||
},
|
||||
'extends': 'eslint:recommended',
|
||||
'globals': {
|
||||
'Atomics': 'readonly',
|
||||
'SharedArrayBuffer': 'readonly'
|
||||
},
|
||||
'parserOptions': {
|
||||
'ecmaVersion': 2018,
|
||||
'sourceType': 'module'
|
||||
},
|
||||
'rules': {
|
||||
'comma-dangle': ['error', {
|
||||
arrays: 'always-multiline',
|
||||
objects: 'always-multiline',
|
||||
imports: 'never',
|
||||
exports: 'never',
|
||||
functions: 'ignore',
|
||||
}],
|
||||
'eol-last': ['error', 'always'],
|
||||
semi: ['error', 'always'],
|
||||
'space-before-function-paren': ['error', {
|
||||
anonymous: 'never',
|
||||
named: 'always',
|
||||
asyncArrow: 'always',
|
||||
}],
|
||||
}
|
||||
}
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,5 +4,3 @@ node_modules
|
||||
**/node_modules
|
||||
.ganache-db
|
||||
.tm_properties
|
||||
yarn-error.log
|
||||
.DS_Store
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"extends": [
|
||||
"solhint:default",
|
||||
"solhint:recommended"
|
||||
],
|
||||
"rules": {
|
||||
"indent": "2"
|
||||
}
|
||||
}
|
||||
19
.travis.yml
19
.travis.yml
@@ -1,19 +0,0 @@
|
||||
---
|
||||
language: node_js
|
||||
node_js:
|
||||
- "lts/*"
|
||||
|
||||
sudo: false
|
||||
dist: xenial
|
||||
|
||||
install:
|
||||
- npm install
|
||||
|
||||
script:
|
||||
- npm run lint:wrapper
|
||||
- npm run lint:contract-tests
|
||||
# - yarn lint:contracts
|
||||
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
14
README.md
14
README.md
@@ -36,7 +36,7 @@ development ganache.
|
||||
|
||||
$ npm run devchain (or aragon devchain --port 7545)
|
||||
|
||||
To clear/reset the chain use (e.g. if you run out of funds on your devchain)
|
||||
To clear/reset the chain use:
|
||||
|
||||
$ npm run devchain -- --reset (or aragon devchain --port 7545 --reset)
|
||||
|
||||
@@ -79,9 +79,9 @@ Kredits DAO independently.
|
||||
|
||||
|
||||
|
||||
A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
|
||||
`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
|
||||
latest app versions and sets the required permissions.
|
||||
A DAO can be deployed using the `scripts/deploy-kit.js` script or with the `npm
|
||||
run deploy:dao` command. This deploys a new Kredits DAO, installs the latest
|
||||
app versions and sets the required permissions.
|
||||
|
||||
See each app in `/apps/*` for details.
|
||||
|
||||
@@ -115,11 +115,11 @@ Script to add a new entries to the contracts using the JS wrapper
|
||||
|
||||
$ truffle exec scripts/add-{contributor, contribution, proposal}.js
|
||||
|
||||
### list-{contributors, contributions, proposals}.js
|
||||
### list-{contributor, contribution, proposal}.js
|
||||
|
||||
List contract entries
|
||||
|
||||
$ truffle exec scripts/list-{contributors, contributions, proposals}.js
|
||||
$ truffle exec scripts/list-{contributor, contribution, proposal}.js
|
||||
|
||||
### send-funds.js
|
||||
|
||||
@@ -152,7 +152,7 @@ Deploys a new KreditsKit that allows to create a new DAO
|
||||
or
|
||||
$ npm run deploy:kit
|
||||
|
||||
`ENS` address is required as environment variable.
|
||||
`ENS` address is required as environment variable.
|
||||
`DAO_FACTORY` can optionally be set as environment variable. (see aragon)
|
||||
|
||||
### new-dao.js
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
module.exports = {
|
||||
'globals': {
|
||||
contract: true,
|
||||
describe: true,
|
||||
it: true,
|
||||
},
|
||||
rules: {
|
||||
'no-unused-vars': ['error', {
|
||||
'argsIgnorePattern': '^_',
|
||||
}],
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@
|
||||
"environments": {
|
||||
"default": {
|
||||
"network": "development",
|
||||
"appName": "kredits-contribution.open.aragonpm.eth"
|
||||
"appName": "kredits-contribution.aragonpm.eth"
|
||||
},
|
||||
"rinkeby": {
|
||||
"registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
|
||||
|
||||
@@ -1,912 +0,0 @@
|
||||
{
|
||||
"roles": [
|
||||
{
|
||||
"name": "Add contributions",
|
||||
"id": "ADD_CONTRIBUTION_ROLE",
|
||||
"params": [],
|
||||
"bytes": "0x493d28cd0d82bcb20db66e4f6390a00122ef772717e282b436ba3240af18bfb1"
|
||||
},
|
||||
{
|
||||
"name": "Manage token contract",
|
||||
"id": "MANAGE_TOKEN_CONTRACT_ROLE",
|
||||
"params": [],
|
||||
"bytes": "0xdd275187bc43df45ce7b34f6716e572716c69ad44e5e496175008950f032854b"
|
||||
},
|
||||
{
|
||||
"name": "Veto contributions",
|
||||
"id": "VETO_CONTRIBUTION_ROLE",
|
||||
"params": [],
|
||||
"bytes": "0x495a36de1ed34d5c1b9f8704e7d8bc8badb027221b09c79691d430bc54c4c88f"
|
||||
}
|
||||
],
|
||||
"environments": {
|
||||
"default": {
|
||||
"network": "development",
|
||||
"appName": "kredits-contribution.open.aragonpm.eth"
|
||||
}
|
||||
},
|
||||
"path": "contracts/Contribution.sol",
|
||||
"appName": "kredits-contribution.open.aragonpm.eth",
|
||||
"appId": "0x09f5274cba299b46c5be722ef672d10eef7a2ef980b612aef529d74fb9da7643",
|
||||
"abi": [
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "hasInitialized",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "ADD_CONTRIBUTION_ROLE",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_script",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "getEVMScriptExecutor",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "getRecoveryVault",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "contributionsCount",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "token",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"name": "allowRecoverability",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "appId",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "getInitializationBlock",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "KERNEL_APP_ADDR_NAMESPACE",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_token",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"name": "transferToVault",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_sender",
|
||||
"type": "address"
|
||||
},
|
||||
{
|
||||
"name": "_role",
|
||||
"type": "bytes32"
|
||||
},
|
||||
{
|
||||
"name": "_params",
|
||||
"type": "uint256[]"
|
||||
}
|
||||
],
|
||||
"name": "canPerform",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "getEVMScriptRegistry",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "contributionOwner",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "contributions",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "claimed",
|
||||
"type": "bool"
|
||||
},
|
||||
{
|
||||
"name": "hashDigest",
|
||||
"type": "bytes32"
|
||||
},
|
||||
{
|
||||
"name": "hashFunction",
|
||||
"type": "uint8"
|
||||
},
|
||||
{
|
||||
"name": "hashSize",
|
||||
"type": "uint8"
|
||||
},
|
||||
{
|
||||
"name": "tokenMetadataURL",
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"name": "confirmedAtBlock",
|
||||
"type": "uint256"
|
||||
},
|
||||
{
|
||||
"name": "vetoed",
|
||||
"type": "bool"
|
||||
},
|
||||
{
|
||||
"name": "exists",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"name": "ownedContributions",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "kernel",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "blocksToWait",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "isPetrified",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"name": "appIds",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "VETO_CONTRIBUTION_ROLE",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "id",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "ContributionAdded",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "id",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "ContributionClaimed",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "id",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "vetoedByAccount",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"name": "ContributionVetoed",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "executor",
|
||||
"type": "address"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "script",
|
||||
"type": "bytes"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "input",
|
||||
"type": "bytes"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "returnData",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "ScriptResult",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "vault",
|
||||
"type": "address"
|
||||
},
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "token",
|
||||
"type": "address"
|
||||
},
|
||||
{
|
||||
"indexed": false,
|
||||
"name": "amount",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"name": "RecoverToVault",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_appIds",
|
||||
"type": "bytes32[4]"
|
||||
}
|
||||
],
|
||||
"name": "initialize",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "getTokenContract",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "getContributorContract",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributorAccount",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"name": "getContributorIdByAddress",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "getContributorAddressById",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "name",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "symbol",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "owner",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"name": "balanceOf",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "ownerOf",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "address"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "owner",
|
||||
"type": "address"
|
||||
},
|
||||
{
|
||||
"name": "index",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "tokenOfOwnerByIndex",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "tokenMetadata",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "confirmedOnly",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"name": "totalKreditsEarned",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "confirmedOnly",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"name": "totalKreditsEarnedByContributor",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "getContribution",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "id",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "claimed",
|
||||
"type": "bool"
|
||||
},
|
||||
{
|
||||
"name": "hashDigest",
|
||||
"type": "bytes32"
|
||||
},
|
||||
{
|
||||
"name": "hashFunction",
|
||||
"type": "uint8"
|
||||
},
|
||||
{
|
||||
"name": "hashSize",
|
||||
"type": "uint8"
|
||||
},
|
||||
{
|
||||
"name": "confirmedAtBlock",
|
||||
"type": "uint256"
|
||||
},
|
||||
{
|
||||
"name": "exists",
|
||||
"type": "bool"
|
||||
},
|
||||
{
|
||||
"name": "vetoed",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "amount",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "contributorId",
|
||||
"type": "uint32"
|
||||
},
|
||||
{
|
||||
"name": "hashDigest",
|
||||
"type": "bytes32"
|
||||
},
|
||||
{
|
||||
"name": "hashFunction",
|
||||
"type": "uint8"
|
||||
},
|
||||
{
|
||||
"name": "hashSize",
|
||||
"type": "uint8"
|
||||
}
|
||||
],
|
||||
"name": "add",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "veto",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "claim",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "contributionId",
|
||||
"type": "uint32"
|
||||
}
|
||||
],
|
||||
"name": "exists",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bool"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
}
|
||||
],
|
||||
"deployment": {
|
||||
"contractName": "Contribution",
|
||||
"compiledAt": "2019-06-13T12:39:07.659Z",
|
||||
"compiler": {
|
||||
"name": "solc",
|
||||
"version": "0.4.24+commit.e67f0147.Emscripten.clang",
|
||||
"optimizer": {
|
||||
"enabled": false
|
||||
}
|
||||
},
|
||||
"flattenedCode": "./code.sol",
|
||||
"transactionHash": "0x073057bb616243e415823fa9a8c8cc096b573fbd0bbf11c2f59bb75a84291689"
|
||||
},
|
||||
"functions": [
|
||||
{
|
||||
"sig": "mintFor(address,uint256,uint32)",
|
||||
"roles": [],
|
||||
"notice": null
|
||||
},
|
||||
{
|
||||
"sig": "initialize(bytes32[4])",
|
||||
"roles": [],
|
||||
"notice": null
|
||||
},
|
||||
{
|
||||
"sig": "add(uint32,uint32,bytes32,uint8,uint8)",
|
||||
"roles": [
|
||||
"ADD_CONTRIBUTION_ROLE"
|
||||
],
|
||||
"notice": null
|
||||
},
|
||||
{
|
||||
"sig": "veto(uint32)",
|
||||
"roles": [
|
||||
"VETO_CONTRIBUTION_ROLE"
|
||||
],
|
||||
"notice": null
|
||||
},
|
||||
{
|
||||
"sig": "claim(uint32)",
|
||||
"roles": [],
|
||||
"notice": null
|
||||
}
|
||||
]
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -118,26 +118,6 @@ contract Contribution is AragonApp {
|
||||
// Custom functions
|
||||
//
|
||||
|
||||
function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
|
||||
for (uint32 i = 1; i <= contributionsCount; i++) {
|
||||
ContributionData memory c = contributions[i];
|
||||
if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
|
||||
amount += c.amount; // should use safemath
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
|
||||
uint256 tokenCount = ownedContributions[contributorId].length;
|
||||
for (uint256 i = 0; i < tokenCount; i++) {
|
||||
uint32 cId = ownedContributions[contributorId][i];
|
||||
ContributionData memory c = contributions[cId];
|
||||
if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
|
||||
amount += c.amount; // should use safemath
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getContribution(uint32 contributionId) public view returns (uint32 id, uint32 contributorId, uint32 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
|
||||
id = contributionId;
|
||||
ContributionData storage c = contributions[id];
|
||||
|
||||
35442
apps/contribution/package-lock.json
generated
35442
apps/contribution/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,18 +3,18 @@
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"dependencies": {
|
||||
"@aragon/os": "^4.2.0",
|
||||
"@aragon/cli": "^5.9.6"
|
||||
"@aragon/os": "^4.1.0",
|
||||
"@aragon/cli": "^5.5.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
"start": "npm run start:aragon:ipfs",
|
||||
"start:aragon:ipfs": "aragon run",
|
||||
"start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
|
||||
"start:app": "",
|
||||
"start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
|
||||
"test": "aragon contracts test",
|
||||
"compile": "aragon contracts compile",
|
||||
"sync-assets": "",
|
||||
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
|
||||
"build:app": "",
|
||||
"build:script": "",
|
||||
"build": "",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// const Contribution = artifacts.require('Contribution.sol');
|
||||
const CounterApp = artifacts.require('Contribution.sol')
|
||||
|
||||
contract('Contribution', (_accounts) => {
|
||||
it('should be tested');
|
||||
});
|
||||
contract('Contribution', (accounts) => {
|
||||
it('should be tested')
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,7 +9,7 @@
|
||||
"environments": {
|
||||
"default": {
|
||||
"network": "development",
|
||||
"appName": "kredits-contributor.open.aragonpm.eth"
|
||||
"appName": "kredits-contributor.aragonpm.eth"
|
||||
},
|
||||
"rinkeby": {
|
||||
"registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
|
||||
|
||||
@@ -6,10 +6,6 @@ import "@aragon/os/contracts/kernel/IKernel.sol";
|
||||
interface ITokenBalance {
|
||||
function balanceOf(address contributorAccount) public view returns (uint256);
|
||||
}
|
||||
interface IContributionBalance {
|
||||
function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
|
||||
function balanceOf(address owner) public view returns (uint256);
|
||||
}
|
||||
|
||||
contract Contributor is AragonApp {
|
||||
bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
|
||||
@@ -47,12 +43,6 @@ contract Contributor is AragonApp {
|
||||
return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
|
||||
}
|
||||
|
||||
function getContributionContract() public view returns (address) {
|
||||
IKernel k = IKernel(kernel());
|
||||
|
||||
return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
|
||||
}
|
||||
|
||||
function coreContributorsCount() view public returns (uint32) {
|
||||
uint32 count = 0;
|
||||
for (uint32 i = 1; i <= contributorsCount; i++) {
|
||||
@@ -128,7 +118,7 @@ contract Contributor is AragonApp {
|
||||
return contributors[id];
|
||||
}
|
||||
|
||||
function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
|
||||
function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, bool exists ) {
|
||||
id = _id;
|
||||
Contributor storage c = contributors[_id];
|
||||
account = c.account;
|
||||
@@ -138,13 +128,10 @@ contract Contributor is AragonApp {
|
||||
isCore = isCoreTeam(id);
|
||||
address token = getTokenContract();
|
||||
balance = ITokenBalance(token).balanceOf(c.account);
|
||||
address contribution = getContributionContract();
|
||||
totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
|
||||
contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
|
||||
exists = c.exists;
|
||||
}
|
||||
|
||||
function canPerform(address _who, address _where, bytes32 _what, uint256[] memory _how) public returns (bool) {
|
||||
function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
|
||||
address sender = _who;
|
||||
if (sender == address(-1)) {
|
||||
sender = tx.origin;
|
||||
|
||||
35442
apps/contributor/package-lock.json
generated
35442
apps/contributor/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,8 @@
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"dependencies": {
|
||||
"@aragon/os": "^4.2.0",
|
||||
"@aragon/cli": "^5.9.6"
|
||||
"@aragon/os": "^4.1.0",
|
||||
"@aragon/cli": "^5.5.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// const Contributor = artifacts.require('Contributor.sol');
|
||||
const CounterApp = artifacts.require('CounterApp.sol')
|
||||
|
||||
contract('Contributor', (_accounts) => {
|
||||
it('should be tested');
|
||||
});
|
||||
contract('CounterApp', (accounts) => {
|
||||
it('should be tested')
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,7 +14,7 @@
|
||||
"environments": {
|
||||
"default": {
|
||||
"network": "development",
|
||||
"appName": "kredits-proposal.open.aragonpm.eth"
|
||||
"appName": "kredits-proposal.aragonpm.eth"
|
||||
},
|
||||
"rinkeby": {
|
||||
"registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"name": "Proposal",
|
||||
"description": "Kredits Proposal app"
|
||||
"description": "Kredits proposal app"
|
||||
}
|
||||
|
||||
35442
apps/proposal/package-lock.json
generated
35442
apps/proposal/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,8 @@
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"dependencies": {
|
||||
"@aragon/os": "^4.2.0",
|
||||
"@aragon/cli": "^5.9.6"
|
||||
"@aragon/os": "^4.1.0",
|
||||
"@aragon/cli": "^5.5.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
// const Proposal = artifacts.require('Proposal.sol');
|
||||
|
||||
contract('Proposal', (_accounts) => {
|
||||
it('should be tested');
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,7 +9,7 @@
|
||||
"environments": {
|
||||
"default": {
|
||||
"network": "development",
|
||||
"appName": "kredits-token.open.aragonpm.eth"
|
||||
"appName": "kredits-token.aragonpm.eth"
|
||||
},
|
||||
"rinkeby": {
|
||||
"registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"name": "Token",
|
||||
"description": "Kredits Token app"
|
||||
"description": "Kredits token app"
|
||||
}
|
||||
|
||||
35442
apps/token/package-lock.json
generated
35442
apps/token/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,8 @@
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"dependencies": {
|
||||
"@aragon/os": "^4.2.0",
|
||||
"@aragon/cli": "^5.9.6"
|
||||
"@aragon/os": "^4.1.0",
|
||||
"@aragon/cli": "^5.5.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// const Token = artifacts.require('Token.sol');
|
||||
const CounterApp = artifacts.require('CounterApp.sol')
|
||||
|
||||
contract('Token', (_accounts) => {
|
||||
it('should be tested');
|
||||
});
|
||||
contract('CounterApp', (accounts) => {
|
||||
it('should be tested')
|
||||
})
|
||||
|
||||
8145
apps/token/yarn.lock
8145
apps/token/yarn.lock
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,7 @@
|
||||
"params": []
|
||||
},
|
||||
{
|
||||
"name": "Add proposal",
|
||||
"name": "Add proposal",
|
||||
"id": "ADD_PROPOSAL_ROLE",
|
||||
"params": []
|
||||
},
|
||||
@@ -34,15 +34,15 @@
|
||||
"environments": {
|
||||
"development": {
|
||||
"network": "development",
|
||||
"apm": "open.aragonpm.eth",
|
||||
"apm": "aragonpm.eth",
|
||||
"registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
|
||||
"appName": "dummy.open.aragonpm.eth"
|
||||
"appName": "dummy.aragonpm.eth"
|
||||
},
|
||||
"rinkeby": {
|
||||
"network": "rinkeby",
|
||||
"registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
|
||||
"wsRPC": "wss://rinkeby.eth.aragon.network/ws",
|
||||
"daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
|
||||
"daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
|
||||
"appName": "dummy.open.aragonpm.eth",
|
||||
"apm": "open.aragonpm.eth"
|
||||
},
|
||||
|
||||
@@ -1,48 +1,16 @@
|
||||
const contractCalls = [
|
||||
['Contributor', 'add', [{
|
||||
account: '0x7e8f313c56f809188313aa274fa67ee58c31515d',
|
||||
name: 'bumi',
|
||||
kind: 'person',
|
||||
url: '',
|
||||
github_username: 'bumi',
|
||||
github_uid: 318,
|
||||
gitea_username: 'bumi',
|
||||
wiki_username: 'Bumi',
|
||||
}, { gasLimit: 200000 }]],
|
||||
|
||||
['Contributor', 'add', [{
|
||||
account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc',
|
||||
name: 'raucao',
|
||||
kind: 'person',
|
||||
url: '',
|
||||
github_username: 'skddc',
|
||||
github_uid: 842,
|
||||
gitea_username: 'raucao',
|
||||
wiki_username: 'Basti',
|
||||
}, { gasLimit: 200000 }]],
|
||||
|
||||
['Contributor', 'add', [{
|
||||
account: '0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62',
|
||||
name: 'Manuel',
|
||||
kind: 'person',
|
||||
url: '',
|
||||
github_username: 'fsmanuel',
|
||||
github_uid: 54812,
|
||||
wiki_username: 'Manuel',
|
||||
}, { gasLimit: 200000 }]],
|
||||
|
||||
['Proposal', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
|
||||
['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
|
||||
['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
|
||||
['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, { gasLimit: 200000 }]],
|
||||
['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, { gasLimit: 200000 }]],
|
||||
['Proposal', 'addProposal', [{ contributorId: 1, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
|
||||
['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
|
||||
['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
|
||||
['Proposal', 'vote', [1, { gasLimit: 550000 }]],
|
||||
['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
|
||||
['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
|
||||
['Contribution', 'claim', [1, { gasLimit: 300000 }]],
|
||||
['Contribution', 'addContribution', [{ contributorId: 1, amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
|
||||
['Contribution', 'addContribution', [{ contributorId: 2, amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
|
||||
['Contribution', 'claim', [1, { gasLimit: 300000 }]]
|
||||
];
|
||||
|
||||
const funds = [
|
||||
'0x7e8f313c56f809188313aa274fa67ee58c31515d',
|
||||
'0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827',
|
||||
'0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
|
||||
];
|
||||
|
||||
module.exports = { contractCalls, funds };
|
||||
|
||||
@@ -34,20 +34,20 @@ contract KreditsKit is KitBase {
|
||||
Contributor contributor = Contributor(_installApp(dao, appIds[uint8(Apps.Contributor)]));
|
||||
contributor.initialize(root, appIds);
|
||||
acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), this);
|
||||
|
||||
|
||||
Token token = Token(_installApp(dao, appIds[uint8(Apps.Token)]));
|
||||
token.initialize(appIds);
|
||||
|
||||
|
||||
Contribution contribution = Contribution(_installApp(dao, appIds[uint8(Apps.Contribution)]));
|
||||
contribution.initialize(appIds);
|
||||
|
||||
|
||||
Proposal proposal = Proposal(_installApp(dao, appIds[uint8(Apps.Proposal)]));
|
||||
proposal.initialize(appIds);
|
||||
|
||||
acl.createPermission(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), this);
|
||||
acl.createPermission(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), this);
|
||||
acl.grantPermission(proposal, contribution, contribution.ADD_CONTRIBUTION_ROLE());
|
||||
|
||||
|
||||
uint256[] memory params = new uint256[](1);
|
||||
params[0] = uint256(203) << 248 | uint256(1) << 240 | uint240(contributor);
|
||||
acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
|
||||
@@ -57,7 +57,7 @@ contract KreditsKit is KitBase {
|
||||
//acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
|
||||
acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
|
||||
acl.grantPermissionP(acl.ANY_ENTITY(), proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
|
||||
|
||||
|
||||
acl.createPermission(root, proposal, proposal.ADD_PROPOSAL_ROLE(), this);
|
||||
//acl.grantPermissionP(address(-1), proposal, proposal.ADD_PROPOSAL_ROLE(), params);
|
||||
acl.grantPermission(acl.ANY_ENTITY(), proposal, proposal.ADD_PROPOSAL_ROLE());
|
||||
@@ -67,9 +67,9 @@ contract KreditsKit is KitBase {
|
||||
acl.setPermissionManager(root, contribution, contribution.ADD_CONTRIBUTION_ROLE());
|
||||
acl.setPermissionManager(root, contribution, contribution.VETO_CONTRIBUTION_ROLE());
|
||||
acl.setPermissionManager(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE());
|
||||
|
||||
|
||||
acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
|
||||
acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());
|
||||
acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());
|
||||
acl.setPermissionManager(root, token, token.MINT_TOKEN_ROLE());
|
||||
|
||||
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
# Contribution deployments
|
||||
|
||||
aragon apm publish major --environment=rinkeby"
|
||||
|
||||
## 2019-04-24 update balances
|
||||
|
||||
✔ Successfully published kredits-contribution.open.aragonpm.eth v6.0.0:
|
||||
ℹ Contract address: 0x2c083EEA83fd3a99C93759D97D0317A43261c758
|
||||
ℹ Content (ipfs): QmULpSqz7BgTFmDu8AL7YZZEz525xkcEzf3dPKtbRdUtFs
|
||||
ℹ Transaction hash: 0x8b01c4c00162e918659d267a2beaf33b578e2aaf9f427f1aa9a43029333c5cd7
|
||||
|
||||
## 2019-04-10 - Weltempfänger release
|
||||
|
||||
✔ Successfully published kredits-contribution.open.aragonpm.eth v5.0.0:
|
||||
|
||||
@@ -1,22 +1,5 @@
|
||||
# Contributor deployments
|
||||
|
||||
aragon apm publish major --environment=rinkeby
|
||||
|
||||
## 2019-04-25 canPerform fix
|
||||
|
||||
✔ Successfully published kredits-contributor.open.aragonpm.eth v6.0.0:
|
||||
ℹ Contract address: 0xA5379D49C718845A1BD7720c6BE3872bA69906cc
|
||||
ℹ Content (ipfs): QmdennNV6s2FNpe6QNYxrUsUXPVdnQGvh1vCi22Tqs8ojq
|
||||
ℹ Transaction hash: 0x51077afeff70a24e87c78bb23ea13bdb9b4445bd43ea7a74a4178fadfeeb6c35
|
||||
|
||||
## 2019-04-24 update balances
|
||||
|
||||
✔ Successfully published kredits-contributor.open.aragonpm.eth v5.0.0:
|
||||
ℹ Contract address: 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86
|
||||
ℹ Content (ipfs): QmeygbQgoj2McLWzo9hJayLWuBZqFaK4HTpa5qLeQdkn5K
|
||||
ℹ Transaction hash: 0x4237a9636f6e4a8190e0d5bcfa85a452da097bf654a173a88e0e1de3d078f08d
|
||||
|
||||
|
||||
## 2019-04-10 - Weltempfänger release
|
||||
|
||||
✔ Successfully published kredits-contributor.open.aragonpm.eth v4.0.0:
|
||||
|
||||
@@ -1,25 +1,5 @@
|
||||
# Kredits deployment
|
||||
|
||||
## 2019-04-25 canPerfom fix
|
||||
|
||||
aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
|
||||
✔ Fetching kredits-contributor.open.aragonpm.eth@latest
|
||||
✔ Upgrading app
|
||||
✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xA5379D49C718845A1BD7720c6BE3872bA69906cc"
|
||||
|
||||
## 2019-04-24 upgrade contributor and contribution
|
||||
|
||||
aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
|
||||
eth-provider | Invalid provider preset/location: "local"
|
||||
✔ Fetching kredits-contributor.open.aragonpm.eth@latest
|
||||
✔ Upgrading app
|
||||
✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86"
|
||||
|
||||
aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
|
||||
✔ Fetching kredits-contribution.open.aragonpm.eth@latest
|
||||
✔ Upgrading app
|
||||
✔ Successfully executed: "Set the resolving address of 'kredits-contribution.open.aragonpm.eth' in namespace 'App code' to 0x2c083EEA83fd3a99C93759D97D0317A43261c758"
|
||||
|
||||
## 2019-04-10 - Weltempfänger release
|
||||
|
||||
Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
||||
[{"constant":true,"inputs":[],"name":"ens","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"fac","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"appId","type":"bytes32"}],"name":"latestVersionAppBase","outputs":[{"name":"base","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"appIds","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_fac","type":"address"},{"name":"_ens","type":"address"},{"name":"_appIds","type":"bytes32[4]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"}],"name":"DeployInstance","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"},{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"constant":false,"inputs":[],"name":"newInstance","outputs":[{"name":"dao","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
|
||||
@@ -2,15 +2,11 @@ const Base = require('./base');
|
||||
const EthersUtils = require('ethers').utils;
|
||||
|
||||
class Acl extends Base {
|
||||
hasPermission (fromAddress, contractAddress, roleID, params = null) {
|
||||
let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));
|
||||
|
||||
return this.functions.hasPermission(
|
||||
fromAddress,
|
||||
contractAddress,
|
||||
roleHash,
|
||||
params
|
||||
);
|
||||
hasPermission(fromAddress, contractAddress, roleID, params = null) {
|
||||
let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));
|
||||
console.log(roleHash)
|
||||
return this.functions.hasPermission(fromAddress, contractAddress, roleHash, params);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,28 +1,23 @@
|
||||
class Base {
|
||||
constructor (contract) {
|
||||
constructor(contract) {
|
||||
this.contract = contract;
|
||||
}
|
||||
|
||||
get functions () {
|
||||
get functions() {
|
||||
return this.contract.functions;
|
||||
}
|
||||
|
||||
get address () {
|
||||
return this.contract.address;
|
||||
}
|
||||
|
||||
get ipfs () {
|
||||
get ipfs() {
|
||||
if (!this._ipfsAPI) { throw new Error('IPFS API not configured; please set an ipfs instance'); }
|
||||
return this._ipfsAPI;
|
||||
}
|
||||
|
||||
set ipfs (ipfsAPI) {
|
||||
set ipfs(ipfsAPI) {
|
||||
this._ipfsAPI = ipfsAPI;
|
||||
}
|
||||
|
||||
on (type, callback) {
|
||||
on(type, callback) {
|
||||
return this.contract.on(type, callback);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Base;
|
||||
|
||||
@@ -1,25 +1,37 @@
|
||||
const Record = require('./record');
|
||||
const ContributionSerializer = require('../serializers/contribution');
|
||||
const deprecate = require('../utils/deprecate');
|
||||
const ethers = require('ethers');
|
||||
|
||||
class Contribution extends Record {
|
||||
get count () {
|
||||
return this.functions.contributionsCount();
|
||||
const ContributionSerializer = require('../serializers/contribution');
|
||||
const Base = require('./base');
|
||||
|
||||
class Contribution extends Base {
|
||||
all() {
|
||||
return this.functions.contributionsCount()
|
||||
.then(async (count) => {
|
||||
let contributions = [];
|
||||
|
||||
for (let id = 1; id <= count; id++) {
|
||||
const contribution = await this.getById(id)
|
||||
contributions.push(contribution);
|
||||
}
|
||||
|
||||
return contributions;
|
||||
});
|
||||
}
|
||||
|
||||
getById (id) {
|
||||
getById(id) {
|
||||
return this.functions.getContribution(id)
|
||||
.then(data => {
|
||||
return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
getByContributorId (contributorId) {
|
||||
getByContributorId(contributorId) {
|
||||
return this.functions.getContributorAddressById(contributorId)
|
||||
.then(address => this.getByContributorAddress(address));
|
||||
}
|
||||
|
||||
getByContributorAddress (address) {
|
||||
getByContributorAddress(address) {
|
||||
return this.functions.balanceOf(address)
|
||||
.then(async (balance) => {
|
||||
const count = balance.toNumber();
|
||||
@@ -35,17 +47,13 @@ class Contribution extends Record {
|
||||
});
|
||||
}
|
||||
|
||||
async add (contributionAttr, callOptions = {}) {
|
||||
const contribution = new ContributionSerializer(contributionAttr);
|
||||
|
||||
try { await contribution.validate(); }
|
||||
catch (error) { return Promise.reject(error); }
|
||||
|
||||
const jsonStr = contribution.serialize();
|
||||
addContribution(contributionAttr, callOptions = {}) {
|
||||
let json = ContributionSerializer.serialize(contributionAttr);
|
||||
// TODO: validate against schema
|
||||
|
||||
return this.ipfs
|
||||
.add(jsonStr)
|
||||
.then(ipfsHashAttr => {
|
||||
.add(json)
|
||||
.then((ipfsHashAttr) => {
|
||||
let contribution = [
|
||||
contributionAttr.amount,
|
||||
contributionAttr.contributorId,
|
||||
@@ -57,11 +65,6 @@ class Contribution extends Record {
|
||||
return this.functions.add(...contribution, callOptions);
|
||||
});
|
||||
}
|
||||
|
||||
addContribution () {
|
||||
deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
|
||||
return this.add(...arguments);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Contribution;
|
||||
|
||||
@@ -1,29 +1,40 @@
|
||||
const Record = require('./record');
|
||||
const ContributorSerializer = require('../serializers/contributor');
|
||||
const formatKredits = require('../utils/format-kredits');
|
||||
const ethers = require('ethers');
|
||||
const RSVP = require('rsvp');
|
||||
|
||||
class Contributor extends Record {
|
||||
get count () {
|
||||
return this.functions.contributorsCount();
|
||||
const ContributorSerializer = require('../serializers/contributor');
|
||||
const Base = require('./base');
|
||||
|
||||
class Contributor extends Base {
|
||||
all() {
|
||||
return this.functions.contributorsCount()
|
||||
.then(count => {
|
||||
let contributors = [];
|
||||
|
||||
for (let id = 1; id <= count; id++) {
|
||||
contributors.push(this.getById(id));
|
||||
}
|
||||
|
||||
return RSVP.all(contributors);
|
||||
});
|
||||
}
|
||||
|
||||
getById (id) {
|
||||
getById(id) {
|
||||
return this.functions.getContributorById(id)
|
||||
.then(data => {
|
||||
data.balanceInt = formatKredits(data.balance);
|
||||
// Fetch IPFS data if available
|
||||
.then((data) => {
|
||||
return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
|
||||
});
|
||||
}
|
||||
|
||||
filterByAccount (search) {
|
||||
filterByAccount(search) {
|
||||
return this._byAccount(search, 'filter');
|
||||
}
|
||||
|
||||
findByAccount (search) {
|
||||
findByAccount(search) {
|
||||
return this._byAccount(search, 'find');
|
||||
}
|
||||
|
||||
_byAccount (search, method = 'filter') {
|
||||
_byAccount(search, method = 'filter') {
|
||||
return this.all().then((contributors) => {
|
||||
const searchEntries = Object.entries(search);
|
||||
|
||||
@@ -39,16 +50,12 @@ class Contributor extends Record {
|
||||
});
|
||||
}
|
||||
|
||||
async add (contributorAttr, callOptions = {}) {
|
||||
let contributor = new ContributorSerializer(contributorAttr);
|
||||
|
||||
try { await contributor.validate(); }
|
||||
catch (error) { return Promise.reject(error); }
|
||||
|
||||
const jsonStr = contributor.serialize();
|
||||
add(contributorAttr, callOptions = {}) {
|
||||
let json = ContributorSerializer.serialize(contributorAttr);
|
||||
// TODO: validate against schema
|
||||
|
||||
return this.ipfs
|
||||
.add(jsonStr)
|
||||
.add(json)
|
||||
.then((ipfsHashAttr) => {
|
||||
let contributor = [
|
||||
contributorAttr.account,
|
||||
@@ -60,30 +67,6 @@ class Contributor extends Record {
|
||||
return this.functions.addContributor(...contributor, callOptions);
|
||||
});
|
||||
}
|
||||
|
||||
updateProfile (contributorId, updateAttr, callOptions = {}) {
|
||||
return this.getById(contributorId).then(async (contributor) => {
|
||||
let updatedContributorAttr = Object.assign(contributor, updateAttr);
|
||||
let updatedContributor = new ContributorSerializer(updatedContributorAttr);
|
||||
|
||||
try { await updatedContributor.validate(); }
|
||||
catch (error) { return Promise.reject(error); }
|
||||
|
||||
const jsonStr = updatedContributor.serialize();
|
||||
|
||||
return this.ipfs
|
||||
.add(jsonStr)
|
||||
.then(ipfsHashAttr => {
|
||||
return this.functions.updateContributorProfileHash(
|
||||
contributorId,
|
||||
ipfsHashAttr.hashDigest,
|
||||
ipfsHashAttr.hashFunction,
|
||||
ipfsHashAttr.hashSize,
|
||||
callOptions
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Contributor;
|
||||
|
||||
@@ -4,5 +4,5 @@ module.exports = {
|
||||
Proposal: require('./proposal'),
|
||||
Token: require('./token'),
|
||||
Kernel: require('./kernel'),
|
||||
Acl: require('./acl'),
|
||||
Acl: require('./acl')
|
||||
};
|
||||
|
||||
@@ -4,19 +4,19 @@ const Base = require('./base');
|
||||
const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';
|
||||
|
||||
class Kernel extends Base {
|
||||
constructor (contract) {
|
||||
constructor(contract) {
|
||||
super(contract);
|
||||
this.apm = 'open.aragonpm.eth'; // can be overwritten if needed
|
||||
this.apm = 'aragonpm.eth'; // can be overwritten if needed
|
||||
}
|
||||
|
||||
getApp (appName) {
|
||||
getApp(appName) {
|
||||
if (appName === 'Acl') {
|
||||
return this.functions.acl();
|
||||
}
|
||||
return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
|
||||
}
|
||||
|
||||
appNamehash (appName) {
|
||||
appNamehash(appName) {
|
||||
return namehash(`kredits-${appName.toLowerCase()}.${this.apm}`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,29 +1,36 @@
|
||||
const Record = require('./record');
|
||||
const ContributionSerializer = require('../serializers/contribution');
|
||||
const deprecate = require('../utils/deprecate');
|
||||
const ethers = require('ethers');
|
||||
const RSVP = require('rsvp');
|
||||
|
||||
class Proposal extends Record {
|
||||
get count () {
|
||||
return this.functions.proposalsCount();
|
||||
const ContributionSerializer = require('../serializers/contribution');
|
||||
const Base = require('./base');
|
||||
|
||||
class Proposal extends Base {
|
||||
all() {
|
||||
return this.functions.proposalsCount()
|
||||
.then(count => {
|
||||
let proposals = [];
|
||||
|
||||
for (let id = 1; id <= count; id++) {
|
||||
proposals.push(this.getById(id));
|
||||
}
|
||||
|
||||
return RSVP.all(proposals);
|
||||
});
|
||||
}
|
||||
|
||||
getById (id) {
|
||||
getById(id) {
|
||||
return this.functions.getProposal(id)
|
||||
.then(data => {
|
||||
return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
|
||||
});
|
||||
}
|
||||
|
||||
async add (proposalAttr, callOptions = {}) {
|
||||
const contribution = new ContributionSerializer(proposalAttr);
|
||||
|
||||
try { await contribution.validate(); }
|
||||
catch (error) { return Promise.reject(error); }
|
||||
|
||||
const jsonStr = contribution.serialize();
|
||||
addProposal(proposalAttr, callOptions = {}) {
|
||||
let json = ContributionSerializer.serialize(proposalAttr);
|
||||
// TODO: validate against schema
|
||||
|
||||
return this.ipfs
|
||||
.add(jsonStr)
|
||||
.add(json)
|
||||
.then((ipfsHashAttr) => {
|
||||
let proposal = [
|
||||
proposalAttr.contributorId,
|
||||
@@ -36,11 +43,6 @@ class Proposal extends Record {
|
||||
return this.functions.addProposal(...proposal, callOptions);
|
||||
});
|
||||
}
|
||||
|
||||
addProposal () {
|
||||
deprecate('The function `addProposal()` is deprecated and will be removed in the next major version. Use `add()` instead');
|
||||
return this.add(...arguments);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Proposal;
|
||||
module.exports = Proposal
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
const Base = require('./base');
|
||||
const paged = require('../utils/pagination');
|
||||
|
||||
class Record extends Base {
|
||||
all (options = {}) {
|
||||
return this.count
|
||||
.then((count) => {
|
||||
let records = paged(count, options).map((id) => this.getById(id));
|
||||
return Promise.all(records);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Record;
|
||||
@@ -4,3 +4,4 @@ class Token extends Base {
|
||||
}
|
||||
|
||||
module.exports = Token;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
const ethers = require('ethers');
|
||||
const RSVP = require('rsvp');
|
||||
|
||||
const Preflight = require('./utils/preflight');
|
||||
const deprecate = require('./utils/deprecate');
|
||||
|
||||
const ABIS = {
|
||||
Contributor: require('./abis/Contributor.json'),
|
||||
@@ -9,29 +9,29 @@ const ABIS = {
|
||||
Token: require('./abis/Token.json'),
|
||||
Proposal: require('./abis/Proposal.json'),
|
||||
Kernel: require('./abis/Kernel.json'),
|
||||
Acl: require('./abis/ACL.json'),
|
||||
Acl: require('./abis/ACL.json')
|
||||
};
|
||||
const APP_CONTRACTS = [
|
||||
'Contributor',
|
||||
'Contribution',
|
||||
'Token',
|
||||
'Proposal',
|
||||
'Acl',
|
||||
'Acl'
|
||||
];
|
||||
const DaoAddresses = require('./addresses/dao.json');
|
||||
|
||||
const Contracts = require('./contracts');
|
||||
const IPFS = require('./utils/ipfs');
|
||||
const IPFS = require('./utils/ipfs')
|
||||
|
||||
// Helpers
|
||||
function capitalize (word) {
|
||||
function capitalize(word) {
|
||||
let [first, ...rest] = word;
|
||||
return `${first.toUpperCase()}${rest.join('')}`;
|
||||
}
|
||||
|
||||
class Kredits {
|
||||
|
||||
constructor (provider, signer, options = {}) {
|
||||
constructor(provider, signer, options = {}) {
|
||||
let { addresses, abis, ipfsConfig } = options;
|
||||
|
||||
this.provider = provider;
|
||||
@@ -43,7 +43,7 @@ class Kredits {
|
||||
this.contracts = {};
|
||||
}
|
||||
|
||||
init (names) {
|
||||
init(names) {
|
||||
let contractsToLoad = names || APP_CONTRACTS;
|
||||
return this.provider.getNetwork().then(network => {
|
||||
this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[network.chainId.toString()];
|
||||
@@ -51,43 +51,22 @@ class Kredits {
|
||||
return this.Kernel.getApp(contractName).then((address) => {
|
||||
this.addresses[contractName] = address;
|
||||
}).catch((error) => {
|
||||
console.log(error);
|
||||
throw new Error(`Failed to get address for ${contractName} from DAO at ${this.Kernel.contract.address}
|
||||
- ${error.message}`
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
return Promise.all(addressPromises).then(() => { return this; });
|
||||
return RSVP.all(addressPromises).then(() => { return this });
|
||||
});
|
||||
}
|
||||
|
||||
static setup (provider, signer, ipfsConfig = null) {
|
||||
deprecate('Kredits.setup() is deprecated use new Kredits().init() instead');
|
||||
static setup(provider, signer, ipfsConfig = null) {
|
||||
console.log('Kredits.setup() is deprecated use new Kredits().init() instead');
|
||||
return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
|
||||
}
|
||||
|
||||
static for (connectionOptions, kreditsOptions) {
|
||||
let { network, rpcUrl, wallet } = connectionOptions;
|
||||
if (!rpcUrl && network === 'local') { rpcUrl = 'http://localhost:8545'; }
|
||||
let ethProvider, signer;
|
||||
if (rpcUrl) {
|
||||
ethProvider = new ethers.providers.JsonRpcProvider(rpcUrl);
|
||||
} else {
|
||||
ethProvider = new ethers.getDefaultProvider(network);
|
||||
}
|
||||
if (wallet) {
|
||||
signer = wallet.connect(ethProvider);
|
||||
} else if (ethProvider.getSigner) {
|
||||
signer = ethProvider.getSigner();
|
||||
}
|
||||
return new Kredits(ethProvider, signer, kreditsOptions);
|
||||
}
|
||||
|
||||
static availableNetworks () {
|
||||
return Object.keys(DaoAddresses);
|
||||
}
|
||||
|
||||
get Kernel () {
|
||||
get Kernel() {
|
||||
let k = this.contractFor('Kernel');
|
||||
// in case we want to use a special apm (e.g. development vs. production)
|
||||
if (this.options.apm) {
|
||||
@@ -96,37 +75,37 @@ class Kredits {
|
||||
return k;
|
||||
}
|
||||
|
||||
get Contributor () {
|
||||
get Contributor() {
|
||||
return this.contractFor('Contributor');
|
||||
}
|
||||
|
||||
get Contributors () {
|
||||
deprecate('Contributors is deprecated use Contributor instead');
|
||||
get Contributors() {
|
||||
console.log('Contributors is deprecated use Contributor instead');
|
||||
return this.Contributor;
|
||||
}
|
||||
|
||||
get Proposal () {
|
||||
get Proposal() {
|
||||
return this.contractFor('Proposal');
|
||||
}
|
||||
|
||||
get Operator () {
|
||||
get Operator() {
|
||||
return this.Proposal;
|
||||
}
|
||||
|
||||
get Token () {
|
||||
get Token() {
|
||||
return this.contractFor('Token');
|
||||
}
|
||||
|
||||
get Contribution () {
|
||||
get Contribution() {
|
||||
return this.contractFor('Contribution');
|
||||
}
|
||||
|
||||
get Acl () {
|
||||
get Acl() {
|
||||
return this.contractFor('Acl');
|
||||
}
|
||||
|
||||
// Should be private
|
||||
contractFor (name) {
|
||||
contractFor(name) {
|
||||
if (this.contracts[name]) {
|
||||
return this.contracts[name];
|
||||
}
|
||||
@@ -146,7 +125,7 @@ class Kredits {
|
||||
return this.contracts[name];
|
||||
}
|
||||
|
||||
preflightChecks () {
|
||||
preflightChecks() {
|
||||
return new Preflight(this).check();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
const ethers = require('ethers');
|
||||
|
||||
const ABI = require('./abis/KreditsKit.json');
|
||||
const Addresses = require('./addresses/KreditsKit.json');
|
||||
|
||||
class KreditsKit {
|
||||
|
||||
constructor (provider, signer, options = {}) {
|
||||
let { address, abi } = options;
|
||||
|
||||
this.provider = provider;
|
||||
this.signer = signer;
|
||||
this.options = options;
|
||||
this.address = address;
|
||||
this.abi = abi || ABI;
|
||||
}
|
||||
|
||||
init () {
|
||||
return this.provider.getNetwork().then((network) => {
|
||||
this.address = this.address || Addresses[network.chainId.toString()];
|
||||
this.contract = new ethers.Contract(
|
||||
this.address,
|
||||
this.abi,
|
||||
(this.signer || this.provider)
|
||||
);
|
||||
return this;
|
||||
});
|
||||
}
|
||||
|
||||
appIdFor (contractName) {
|
||||
// see appIds in KreditsKit.sol for more details
|
||||
const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
|
||||
return this.contract.functions.appIds(knownContracts.indexOf(contractName));
|
||||
}
|
||||
|
||||
newDAO (options = {}) {
|
||||
return this.contract.functions.newInstance(options).then(transaction => {
|
||||
return transaction.wait().then(result => {
|
||||
const deployEvent = result.events.find(e => e.event === 'DeployInstance');
|
||||
return {
|
||||
daoAddress: deployEvent.args.dao,
|
||||
transactionHash: transaction.hash,
|
||||
};
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = KreditsKit;
|
||||
@@ -1,75 +1,19 @@
|
||||
const schemas = require('kosmos-schemas');
|
||||
const validator = require('../utils/validator');
|
||||
|
||||
/**
|
||||
* Serialization and validation for JSON-LD document of the contribution.
|
||||
* Handle serialization for JSON-LD object of the contribution, according to
|
||||
* https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
|
||||
*
|
||||
* @class
|
||||
* @public
|
||||
*/
|
||||
class Contribution {
|
||||
|
||||
constructor (attrs) {
|
||||
Object.keys(attrs).forEach(a => this[a] = attrs[a]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Serialize object to JSON
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
serialize () {
|
||||
/**
|
||||
* Deserialize JSON to object
|
||||
*
|
||||
* @method
|
||||
* @public
|
||||
*/
|
||||
static deserialize(serialized) {
|
||||
let {
|
||||
contributorIpfsHash,
|
||||
date,
|
||||
time,
|
||||
kind,
|
||||
description,
|
||||
url,
|
||||
details,
|
||||
} = this;
|
||||
|
||||
let data = {
|
||||
'@context': 'https://schema.kosmos.org',
|
||||
'@type': 'Contribution',
|
||||
'contributor': {
|
||||
'ipfs': contributorIpfsHash,
|
||||
},
|
||||
date,
|
||||
time,
|
||||
kind,
|
||||
description,
|
||||
'details': details || {},
|
||||
};
|
||||
|
||||
if (url) {
|
||||
data['url'] = url;
|
||||
}
|
||||
|
||||
// Write it pretty to ipfs
|
||||
return JSON.stringify(data, null, 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate serialized data against schema
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
validate () {
|
||||
const serialized = JSON.parse(this.serialize());
|
||||
const valid = validator.validate(serialized, schemas['contribution']);
|
||||
return valid ? Promise.resolve() : Promise.reject(validator.error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deserialize JSON to object
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
static deserialize (serialized) {
|
||||
let {
|
||||
date,
|
||||
time,
|
||||
kind,
|
||||
description,
|
||||
details,
|
||||
@@ -77,8 +21,6 @@ class Contribution {
|
||||
} = JSON.parse(serialized.toString('utf8'));
|
||||
|
||||
return {
|
||||
date,
|
||||
time,
|
||||
kind,
|
||||
description,
|
||||
details,
|
||||
@@ -87,6 +29,39 @@ class Contribution {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Serialize object to JSON
|
||||
*
|
||||
* @method
|
||||
* @public
|
||||
*/
|
||||
static serialize(deserialized) {
|
||||
let {
|
||||
contributorIpfsHash,
|
||||
kind,
|
||||
description,
|
||||
url,
|
||||
details
|
||||
} = deserialized;
|
||||
|
||||
let data = {
|
||||
"@context": "https://schema.kosmos.org",
|
||||
"@type": "Contribution",
|
||||
"contributor": {
|
||||
"ipfs": contributorIpfsHash
|
||||
},
|
||||
kind,
|
||||
description,
|
||||
"details": details || {}
|
||||
};
|
||||
|
||||
if (url) {
|
||||
data["url"] = url;
|
||||
}
|
||||
|
||||
// Write it pretty to ipfs
|
||||
return JSON.stringify(data, null, 2);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Contribution;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
const schemas = require('kosmos-schemas');
|
||||
const validator = require('../utils/validator');
|
||||
/**
|
||||
* Handle serialization for JSON-LD object of the contributor, according to
|
||||
* https://github.com/67P/kosmos-schemas/blob/master/schemas/contributor.json
|
||||
@@ -8,88 +6,13 @@ const validator = require('../utils/validator');
|
||||
* @public
|
||||
*/
|
||||
class Contributor {
|
||||
|
||||
constructor (attrs) {
|
||||
Object.keys(attrs).forEach(a => this[a] = attrs[a]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Serialize object to JSON
|
||||
*
|
||||
* @method
|
||||
* @public
|
||||
*/
|
||||
serialize () {
|
||||
let {
|
||||
name,
|
||||
kind,
|
||||
url,
|
||||
github_uid,
|
||||
github_username,
|
||||
gitea_username,
|
||||
wiki_username,
|
||||
accounts,
|
||||
} = this;
|
||||
|
||||
let data = {
|
||||
'@context': 'https://schema.kosmos.org',
|
||||
'@type': 'Contributor',
|
||||
kind,
|
||||
name,
|
||||
accounts: accounts || [],
|
||||
};
|
||||
|
||||
if (url) {
|
||||
data['url'] = url;
|
||||
}
|
||||
|
||||
if (github_uid) {
|
||||
data.accounts.push({
|
||||
'site': 'github.com',
|
||||
'uid': github_uid,
|
||||
'username': github_username,
|
||||
'url': `https://github.com/${github_username}`,
|
||||
});
|
||||
}
|
||||
|
||||
if (gitea_username) {
|
||||
data.accounts.push({
|
||||
'site': 'gitea.kosmos.org',
|
||||
'username': gitea_username,
|
||||
'url': `https://gitea.kosmos.org/${gitea_username}`,
|
||||
});
|
||||
}
|
||||
|
||||
if (wiki_username) {
|
||||
data.accounts.push({
|
||||
'site': 'wiki.kosmos.org',
|
||||
'username': wiki_username,
|
||||
'url': `https://wiki.kosmos.org/User:${wiki_username}`,
|
||||
});
|
||||
}
|
||||
|
||||
// Write it pretty to ipfs
|
||||
return JSON.stringify(data, null, 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate serialized data against schema
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
validate () {
|
||||
const serialized = JSON.parse(this.serialize());
|
||||
const valid = validator.validate(serialized, schemas['contributor']);
|
||||
return valid ? Promise.resolve() : Promise.reject(validator.error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deserialize JSON to object
|
||||
*
|
||||
* @method
|
||||
* @public
|
||||
*/
|
||||
static deserialize (serialized) {
|
||||
static deserialize(serialized) {
|
||||
let {
|
||||
name,
|
||||
kind,
|
||||
@@ -97,17 +20,13 @@ class Contributor {
|
||||
accounts,
|
||||
} = JSON.parse(serialized.toString('utf8'));
|
||||
|
||||
let github_username, github_uid, gitea_username, wiki_username;
|
||||
let github = accounts.find(a => a.site === 'github.com');
|
||||
let gitea = accounts.find(a => a.site === 'gitea.kosmos.org');
|
||||
let wiki = accounts.find(a => a.site === 'wiki.kosmos.org');
|
||||
let github_username, github_uid, wiki_username;
|
||||
let github = accounts.find((a) => a.site === 'github.com');
|
||||
let wiki = accounts.find((a) => a.site === 'wiki.kosmos.org');
|
||||
|
||||
if (github) {
|
||||
(({ username: github_username, uid: github_uid} = github));
|
||||
}
|
||||
if (gitea) {
|
||||
(({ username: gitea_username } = gitea));
|
||||
}
|
||||
if (wiki) {
|
||||
(({ username: wiki_username } = wiki));
|
||||
}
|
||||
@@ -119,12 +38,59 @@ class Contributor {
|
||||
accounts,
|
||||
github_uid,
|
||||
github_username,
|
||||
gitea_username,
|
||||
wiki_username,
|
||||
ipfsData: serialized,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Serialize object to JSON
|
||||
*
|
||||
* @method
|
||||
* @public
|
||||
*/
|
||||
static serialize(deserialized) {
|
||||
let {
|
||||
name,
|
||||
kind,
|
||||
url,
|
||||
github_uid,
|
||||
github_username,
|
||||
wiki_username,
|
||||
} = deserialized;
|
||||
|
||||
let data = {
|
||||
"@context": "https://schema.kosmos.org",
|
||||
"@type": "Contributor",
|
||||
kind,
|
||||
name,
|
||||
"accounts": []
|
||||
};
|
||||
|
||||
if (url) {
|
||||
data["url"] = url;
|
||||
}
|
||||
|
||||
if (github_uid) {
|
||||
data.accounts.push({
|
||||
"site": "github.com",
|
||||
"uid": github_uid,
|
||||
"username": github_username,
|
||||
"url": `https://github.com/${github_username}`
|
||||
});
|
||||
}
|
||||
|
||||
if (wiki_username) {
|
||||
data.accounts.push({
|
||||
"site": "wiki.kosmos.org",
|
||||
"username": wiki_username,
|
||||
"url": `https://wiki.kosmos.org/User:${wiki_username}`
|
||||
});
|
||||
}
|
||||
|
||||
// Write it pretty to ipfs
|
||||
return JSON.stringify(data, null, 2);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Contributor;
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
/*eslint no-console: ["error", { allow: ["warn"] }] */
|
||||
|
||||
module.exports = function deprecate (msg) {
|
||||
console.warn(msg);
|
||||
};
|
||||
@@ -1,10 +0,0 @@
|
||||
const ethersUtils = require('ethers').utils;
|
||||
|
||||
module.exports = function(value, options = {}) {
|
||||
let etherValue = ethersUtils.formatEther(value);
|
||||
if (options.asFloat) {
|
||||
return parseFloat(etherValue);
|
||||
} else {
|
||||
return parseInt(etherValue);
|
||||
}
|
||||
};
|
||||
@@ -2,7 +2,8 @@ const ipfsClient = require('ipfs-http-client');
|
||||
const multihashes = require('multihashes');
|
||||
|
||||
class IPFS {
|
||||
constructor (config) {
|
||||
|
||||
constructor(config) {
|
||||
if (!config) {
|
||||
config = { host: 'localhost', port: '5001', protocol: 'http' };
|
||||
}
|
||||
@@ -10,7 +11,7 @@ class IPFS {
|
||||
this._config = config;
|
||||
}
|
||||
|
||||
catAndMerge (data, deserialize) {
|
||||
catAndMerge(data, deserialize) {
|
||||
// if no hash details are found simply return the data; nothing to merge
|
||||
if (!data.hashSize || data.hashSize === 0) {
|
||||
return data;
|
||||
@@ -25,7 +26,7 @@ class IPFS {
|
||||
});
|
||||
}
|
||||
|
||||
add (data) {
|
||||
add(data) {
|
||||
return this._ipfsAPI
|
||||
.add(ipfsClient.Buffer.from(data))
|
||||
.then((res) => {
|
||||
@@ -33,7 +34,7 @@ class IPFS {
|
||||
});
|
||||
}
|
||||
|
||||
cat (hashData) {
|
||||
cat(hashData) {
|
||||
let ipfsHash = hashData; // default - if it is a string
|
||||
if (hashData.hasOwnProperty('hashSize')) {
|
||||
ipfsHash = this.encodeHash(hashData);
|
||||
@@ -41,20 +42,21 @@ class IPFS {
|
||||
return this._ipfsAPI.cat(ipfsHash);
|
||||
}
|
||||
|
||||
decodeHash (ipfsHash) {
|
||||
decodeHash(ipfsHash) {
|
||||
let multihash = multihashes.decode(multihashes.fromB58String(ipfsHash));
|
||||
return {
|
||||
hashDigest: '0x' + multihashes.toHexString(multihash.digest),
|
||||
hashSize: multihash.length,
|
||||
hashFunction: multihash.code,
|
||||
ipfsHash: ipfsHash,
|
||||
ipfsHash: ipfsHash
|
||||
};
|
||||
}
|
||||
|
||||
encodeHash (hashData) {
|
||||
encodeHash(hashData) {
|
||||
let digest = ipfsClient.Buffer.from(hashData.hashDigest.slice(2), 'hex');
|
||||
return multihashes.encode(digest, hashData.hashFunction, hashData.hashSize);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = IPFS;
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
function pageNumber (number, size, recordCount) {
|
||||
let numberOfPages = Math.ceil(recordCount / size);
|
||||
|
||||
number = parseInt(number) || 1;
|
||||
|
||||
// Ensure page number is in range
|
||||
number = number > numberOfPages ? numberOfPages : number;
|
||||
number = number < 1 ? 1 : number;
|
||||
|
||||
return number;
|
||||
}
|
||||
|
||||
function buildIds (order, number, size, recordCount) {
|
||||
let offset = size * (number - 1);
|
||||
|
||||
let start;
|
||||
let mapFunction;
|
||||
|
||||
if (order === 'asc') {
|
||||
start = 1 + offset;
|
||||
mapFunction = (_, i) => start + i;
|
||||
} else {
|
||||
start = recordCount - offset;
|
||||
mapFunction = (_, i) => start - i;
|
||||
}
|
||||
|
||||
// Ensure size is in range
|
||||
let end = offset + size;
|
||||
if (end > recordCount) {
|
||||
let diff = end - recordCount;
|
||||
size = size - diff;
|
||||
}
|
||||
|
||||
return Array.from({ length: size }, mapFunction);
|
||||
}
|
||||
|
||||
module.exports = function paged (recordCount, options = {}) {
|
||||
let { order, page } = options;
|
||||
order = order || 'desc';
|
||||
page = page || {};
|
||||
|
||||
let size = parseInt(page.size) || 25;
|
||||
let number = pageNumber(page.number, size, recordCount);
|
||||
|
||||
return buildIds(order, number, size, recordCount);
|
||||
};
|
||||
@@ -1,9 +1,9 @@
|
||||
class Preflight {
|
||||
constructor (kredits) {
|
||||
constructor(kredits) {
|
||||
this.kredits = kredits;
|
||||
}
|
||||
|
||||
check () {
|
||||
check() {
|
||||
return this.kredits.ipfs._ipfsAPI.id()
|
||||
.catch((error) => {
|
||||
throw new Error(`IPFS node not available; config: ${JSON.stringify(this.kredits.ipfs.config)} - ${error.message}`);
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
const tv4 = require('tv4');
|
||||
const validator = tv4.freshApi();
|
||||
|
||||
validator.addFormat({
|
||||
'date': function(value) {
|
||||
const dateRegexp = /^[0-9]{4,}-[0-9]{2}-[0-9]{2}$/;
|
||||
return dateRegexp.test(value) ? null : 'A valid ISO 8601 full-date string is expected';
|
||||
},
|
||||
'time': function(value) {
|
||||
const timeRegexp = /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([+|-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
|
||||
return timeRegexp.test(value) ? null : 'A valid ISO 8601 full-time string is expected';
|
||||
},
|
||||
});
|
||||
|
||||
module.exports = validator;
|
||||
37993
package-lock.json
generated
37993
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
30
package.json
30
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "kredits-contracts",
|
||||
"version": "5.3.0",
|
||||
"version": "4.0.2",
|
||||
"description": "Ethereum contracts and npm wrapper for Kredits",
|
||||
"main": "./lib/kredits.js",
|
||||
"directories": {
|
||||
@@ -8,7 +8,6 @@
|
||||
},
|
||||
"scripts": {
|
||||
"install-all": "./scripts/every-app.sh \"npm install\"",
|
||||
"postshrinkwrap": "node scripts/fix-package-lock.js &>/dev/null || true",
|
||||
"build-json": "npm run compile-contracts && node ./scripts/build-json.js",
|
||||
"repl": "truffle exec scripts/repl.js",
|
||||
"seeds": "truffle exec scripts/seeds.js",
|
||||
@@ -21,11 +20,7 @@
|
||||
"deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
|
||||
"devchain": "aragon devchain --port 7545",
|
||||
"dao:address": "truffle exec scripts/current-address.js",
|
||||
"lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"",
|
||||
"lint:contract-tests": "eslint apps/*/test",
|
||||
"lint:wrapper": "eslint lib/",
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"setup-git-hooks": "sh scripts/git-hooks/install"
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -38,26 +33,19 @@
|
||||
},
|
||||
"homepage": "https://github.com/67P/truffle-kredits#readme",
|
||||
"devDependencies": {
|
||||
"@aragon/cli": "^5.9.6",
|
||||
"@aragon/cli": "^5.5.0",
|
||||
"@aragon/kits-base": "^1.0.0",
|
||||
"@aragon/os": "^4.2.0",
|
||||
"@aragon/os": "^4.1.0",
|
||||
"async-each-series": "^1.1.0",
|
||||
"cli-table": "^0.3.1",
|
||||
"eslint": "^5.16.0",
|
||||
"eslint-plugin-import": "^2.17.3",
|
||||
"eslint-plugin-node": "^8.0.1",
|
||||
"eslint-plugin-promise": "^4.1.1",
|
||||
"eth-provider": "^0.2.2",
|
||||
"openzeppelin-solidity": "^2.2.0",
|
||||
"promptly": "^3.0.3",
|
||||
"solc": "^0.4.26",
|
||||
"solhint": "^2.1.0",
|
||||
"yargs": "^12.0.0"
|
||||
"solc": "^0.4.25"
|
||||
},
|
||||
"dependencies": {
|
||||
"ethers": "^4.0.29",
|
||||
"ipfs-http-client": "^32.0.1",
|
||||
"kosmos-schemas": "^2.1.0",
|
||||
"tv4": "^1.3.0"
|
||||
"ethers": "^4.0.27",
|
||||
"ipfs-http-client": "^30.1.1",
|
||||
"rsvp": "^4.8.2"
|
||||
},
|
||||
"keywords": [
|
||||
"kosmos",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
const promptly = require('promptly');
|
||||
const { inspect } = require('util');
|
||||
|
||||
const initKredits = require('./helpers/init_kredits.js');
|
||||
|
||||
@@ -27,32 +26,23 @@ module.exports = async function(callback) {
|
||||
|
||||
console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
|
||||
|
||||
[ dateNow, timeNow ] = (new Date()).toISOString().split('T');
|
||||
|
||||
let contributionAttributes = {
|
||||
contributorId,
|
||||
date: dateNow,
|
||||
time: timeNow,
|
||||
amount: await promptly.prompt('Amount: '),
|
||||
description: await promptly.prompt('Description: '),
|
||||
kind: await promptly.prompt('Kind: ', { default: 'dev' }),
|
||||
url: await promptly.prompt('URL: ', { default: '' })
|
||||
}
|
||||
|
||||
const contributorData = await kredits.Contributor.getById(contributorId);
|
||||
contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
|
||||
|
||||
console.log("\nAdding contribution:");
|
||||
console.log(contributionAttributes);
|
||||
|
||||
kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
|
||||
.then(result => {
|
||||
console.log("\n\nResult:");
|
||||
console.log(result);
|
||||
callback();
|
||||
})
|
||||
.catch(error => {
|
||||
console.log('Failed to create contribution');
|
||||
callback(inspect(error));
|
||||
});
|
||||
kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 }).then((result) => {
|
||||
console.log("\n\nResult:");
|
||||
console.log(result);
|
||||
callback();
|
||||
}).catch((error) => {
|
||||
console.log('Failed to create contribution');
|
||||
callback(error);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ module.exports = async function(callback) {
|
||||
kind: await prompt('Kind (default person): ', {default: 'person'}),
|
||||
url: await prompt('URL: '),
|
||||
github_username: await prompt('GitHub username: '),
|
||||
github_uid: parseInt(await prompt('GitHub UID: ')),
|
||||
github_uid: await prompt('GitHub UID: '),
|
||||
wiki_username: await prompt('Wiki username: '),
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
const promptly = require('promptly');
|
||||
const { inspect } = require('util');
|
||||
|
||||
const initKredits = require('./helpers/init_kredits.js');
|
||||
|
||||
@@ -26,31 +25,23 @@ module.exports = async function(callback) {
|
||||
}
|
||||
console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
|
||||
|
||||
[ dateNow, timeNow ] = (new Date()).toISOString().split('T');
|
||||
|
||||
let contributionAttributes = {
|
||||
contributorId,
|
||||
date: dateNow,
|
||||
time: timeNow,
|
||||
amount: await promptly.prompt('Amount: '),
|
||||
description: await promptly.prompt('Description: '),
|
||||
kind: await promptly.prompt('Kind: ', { default: 'dev' }),
|
||||
url: await promptly.prompt('URL: ', { default: '' })
|
||||
}
|
||||
|
||||
const contributorData = await kredits.Contributor.getById(contributorId);
|
||||
contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
|
||||
|
||||
console.log("\nAdding proposal:");
|
||||
console.log(contributionAttributes);
|
||||
|
||||
kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 })
|
||||
.then((result) => {
|
||||
console.log("\n\nResult:");
|
||||
console.log(result);
|
||||
callback();
|
||||
}).catch((error) => {
|
||||
console.log('Failed to create proposal');
|
||||
callback(inspect(error));
|
||||
});
|
||||
kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 }).then((result) => {
|
||||
console.log("\n\nResult:");
|
||||
console.log(result);
|
||||
callback();
|
||||
}).catch((error) => {
|
||||
console.log('Failed to create proposal');
|
||||
callback(error);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
const promptly = require('promptly');
|
||||
const Table = require('cli-table');
|
||||
|
||||
const initKredits = require('./helpers/init_kredits.js');
|
||||
|
||||
module.exports = async function(callback) {
|
||||
let kredits;
|
||||
try {
|
||||
kredits = await initKredits(web3);
|
||||
} catch(e) {
|
||||
callback(e);
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
|
||||
|
||||
let recipient = await promptly.prompt('Contributor ID: ');
|
||||
recipient = parseInt(recipient);
|
||||
|
||||
const table = new Table({
|
||||
head: ['ID', 'Description', 'Amount', 'Claim Transaction'],
|
||||
});
|
||||
|
||||
try {
|
||||
let blockNumber = await kredits.provider.getBlockNumber();
|
||||
let contributions = await kredits.Contribution.all({page: {size: 200}});
|
||||
|
||||
console.log(`Current block number: ${blockNumber}`);
|
||||
let claimPromises = contributions.map(async (c) => {
|
||||
const confirmed = c.confirmedAtBlock <= blockNumber;
|
||||
|
||||
if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
|
||||
console.log(`Claiming contribution ID=${c.id}`);
|
||||
return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
|
||||
table.push([
|
||||
c.id.toString(),
|
||||
`${c.description}`,
|
||||
c.amount.toString(),
|
||||
tx.hash,
|
||||
]);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Promise.all(claimPromises).then(_ => {
|
||||
console.log(table.toString());
|
||||
callback();
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
callback();
|
||||
}
|
||||
};
|
||||
363
scripts/deploy-apm.js
Normal file
363
scripts/deploy-apm.js
Normal file
@@ -0,0 +1,363 @@
|
||||
const namehash = require('eth-ens-namehash').hash
|
||||
const keccak256 = require('js-sha3').keccak_256
|
||||
|
||||
const deployENS = require('@aragon/os/scripts/deploy-test-ens')
|
||||
const deployDaoFactory = require('@aragon/os/scripts/deploy-daofactory')
|
||||
const logDeploy = require('@aragon/os/scripts//helpers/deploy-logger')
|
||||
const getAccounts = require('@aragon/os/scripts//helpers/get-accounts')
|
||||
|
||||
const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
|
||||
const globalWeb3 = this.web3 // Not injected unless called directly via truffle
|
||||
|
||||
const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
|
||||
|
||||
const defaultOwner = process.env.OWNER
|
||||
const defaultDaoFactoryAddress = process.env.DAO_FACTORY
|
||||
const defaultENSAddress = process.env.ENS
|
||||
|
||||
module.exports = async (
|
||||
truffleExecCallback,
|
||||
{
|
||||
artifacts = globalArtifacts,
|
||||
web3 = globalWeb3,
|
||||
ensAddress = defaultENSAddress,
|
||||
owner = defaultOwner,
|
||||
daoFactoryAddress = defaultDaoFactoryAddress,
|
||||
verbose = true
|
||||
} = {}
|
||||
) => {
|
||||
const log = (...args) => {
|
||||
if (verbose) { console.log(...args) }
|
||||
}
|
||||
|
||||
const APMRegistry = artifacts.require('APMRegistry')
|
||||
const Repo = artifacts.require('Repo')
|
||||
const ENSSubdomainRegistrar = artifacts.require('ENSSubdomainRegistrar')
|
||||
|
||||
const DAOFactory = artifacts.require('DAOFactory')
|
||||
const APMRegistryFactory = artifacts.require('APMRegistryFactory')
|
||||
const ENS = artifacts.require('ENS')
|
||||
|
||||
const Kernel = artifacts.require('Kernel')
|
||||
const ACL = artifacts.require('ACL')
|
||||
|
||||
const tldName = 'eth'
|
||||
const labelName = 'aragonpm'
|
||||
const tldHash = namehash(tldName)
|
||||
const labelHash = '0x'+keccak256(labelName)
|
||||
const apmNode = namehash(`${labelName}.${tldName}`)
|
||||
|
||||
let ens
|
||||
|
||||
log('Deploying APM...')
|
||||
|
||||
const accounts = await getAccounts(web3)
|
||||
if (!owner) {
|
||||
owner = accounts[0]
|
||||
log('OWNER env variable not found, setting APM owner to the provider\'s first account')
|
||||
}
|
||||
log('Owner:', owner)
|
||||
|
||||
if (!ensAddress) {
|
||||
log('=========')
|
||||
log('Missing ENS! Deploying a custom ENS...')
|
||||
ens = (await deployENS(null, { artifacts, owner, verbose: false })).ens
|
||||
ensAddress = ens.address
|
||||
} else {
|
||||
ens = ENS.at(ensAddress)
|
||||
}
|
||||
|
||||
log('ENS:', ensAddress)
|
||||
log(`TLD: ${tldName} (${tldHash})`)
|
||||
log(`Label: ${labelName} (${labelHash})`)
|
||||
log(`apmNode: ${apmNode}`)
|
||||
|
||||
log('=========')
|
||||
log('Deploying APM bases...')
|
||||
|
||||
const apmRegistryBase = await APMRegistry.new()
|
||||
await logDeploy(apmRegistryBase, { verbose })
|
||||
const apmRepoBase = await Repo.new()
|
||||
await logDeploy(apmRepoBase, { verbose })
|
||||
const ensSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
|
||||
await logDeploy(ensSubdomainRegistrarBase, { verbose })
|
||||
|
||||
let daoFactory
|
||||
if (daoFactoryAddress) {
|
||||
daoFactory = DAOFactory.at(daoFactoryAddress)
|
||||
const hasEVMScripts = await daoFactory.regFactory() !== ZERO_ADDR
|
||||
|
||||
log(`Using provided DAOFactory (with${hasEVMScripts ? '' : 'out' } EVMScripts):`, daoFactoryAddress)
|
||||
} else {
|
||||
log('Deploying DAOFactory with EVMScripts...')
|
||||
daoFactory = (await deployDaoFactory(null, { artifacts, withEvmScriptRegistryFactory: true, verbose: false })).daoFactory
|
||||
}
|
||||
|
||||
log('Deploying APMRegistryFactory...')
|
||||
const apmFactory = await APMRegistryFactory.new(
|
||||
daoFactory.address,
|
||||
apmRegistryBase.address,
|
||||
apmRepoBase.address,
|
||||
ensSubdomainRegistrarBase.address,
|
||||
ensAddress,
|
||||
'0x00'
|
||||
)
|
||||
await logDeploy(apmFactory, { verbose })
|
||||
|
||||
|
||||
log(`Assigning ENS name (${labelName}.${tldName}) to factory... ${apmFactory.address}`)
|
||||
|
||||
if (await ens.owner(apmNode) === accounts[0]) {
|
||||
log('Transferring name ownership from deployer to APMRegistryFactory')
|
||||
await ens.setOwner(apmNode, apmFactory.address)
|
||||
} else {
|
||||
log('Creating subdomain and assigning it to APMRegistryFactory')
|
||||
try {
|
||||
await ens.setSubnodeOwner(tldHash, labelHash, apmFactory.address)
|
||||
//await ens.setSubnodeOwner(apmNode, keccak256('open'), apmFactory.address)
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
console.error(
|
||||
`Error: could not set the owner of '${labelName}.${tldName}' on the given ENS instance`,
|
||||
`(${ensAddress}). Make sure you have ownership rights over the subdomain.`
|
||||
)
|
||||
throw err
|
||||
}
|
||||
}
|
||||
|
||||
log('Deploying APM...')
|
||||
const receipt = await apmFactory.newAPM(tldHash, labelHash, owner)
|
||||
|
||||
log('=========')
|
||||
const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
|
||||
console.log(receipt.logs);
|
||||
const apmDAO = APMRegistry.at(apmAddr);
|
||||
|
||||
log('Address:', apmAddr)
|
||||
log('Transaction hash:', receipt.tx)
|
||||
|
||||
|
||||
|
||||
|
||||
log('Deploying subdomain APM bases...')
|
||||
|
||||
const subApmRegistryBase = await APMRegistry.new()
|
||||
await logDeploy(subApmRegistryBase, { verbose })
|
||||
const subApmRepoBase = await Repo.new()
|
||||
await logDeploy(subApmRepoBase, { verbose })
|
||||
const subEnsSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
|
||||
await logDeploy(subEnsSubdomainRegistrarBase, { verbose })
|
||||
|
||||
log('Deploying APMRegistryFactory...')
|
||||
const subApmFactory = await APMRegistryFactory.new(
|
||||
daoFactory.address,
|
||||
subApmRegistryBase.address,
|
||||
subApmRepoBase.address,
|
||||
subEnsSubdomainRegistrarBase.address,
|
||||
ensAddress,
|
||||
'0x00'
|
||||
)
|
||||
await logDeploy(subApmFactory, { verbose })
|
||||
|
||||
|
||||
const kernelAddr = await apmDAO.kernel();
|
||||
console.log(kernelAddr);
|
||||
const aclAddr = await Kernel.at(kernelAddr).acl();
|
||||
const acl = ACL.at(aclAddr);
|
||||
|
||||
const role = await ensSubdomainRegistrarBase.CREATE_NAME_ROLE();
|
||||
const registrarAddr = await apmDAO.registrar();
|
||||
const registrar = ENSSubdomainRegistrar.at(registrarAddr);
|
||||
|
||||
console.log(owner, registrarAddr, role);
|
||||
|
||||
try {
|
||||
await acl.grantPermission(owner, registrarAddr, role);
|
||||
|
||||
log('Deploying subdomain APM...')
|
||||
|
||||
console.log(await acl.hasPermission(owner, registrar.address, role))
|
||||
console.log(subApmFactory.address)
|
||||
await registrar.createNameAndPoint(namehash('open'), subApmFactory.address)
|
||||
|
||||
const subReceipt = await subApmFactory.newAPM(namehash('aragonpm.eth'), namehash('open'), owner)
|
||||
|
||||
log('=========')
|
||||
const subApmAddr = subReceipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
|
||||
console.log(subReceipt.logs);
|
||||
console.log(subApmAddr);
|
||||
|
||||
} catch(e) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
if (typeof truffleExecCallback === 'function') {
|
||||
// Called directly via `truffle exec`
|
||||
truffleExecCallback()
|
||||
} else {
|
||||
return {
|
||||
apmFactory,
|
||||
ens,
|
||||
apm: APMRegistry.at(apmAddr),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
"
|
||||
|
||||
const namehash = require('eth-ens-namehash').hash
|
||||
const keccak256 = require('js-sha3').keccak_256
|
||||
|
||||
const deployENS = require('@aragon/os/scripts/deploy-test-ens')
|
||||
const deployDaoFactory = require('@aragon/os/scripts/deploy-daofactory')
|
||||
const logDeploy = require('@aragon/os/scripts//helpers/deploy-logger')
|
||||
const getAccounts = require('@aragon/os/scripts//helpers/get-accounts')
|
||||
|
||||
const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
|
||||
const globalWeb3 = this.web3 // Not injected unless called directly via truffle
|
||||
|
||||
const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
|
||||
|
||||
const defaultOwner = process.env.OWNER
|
||||
const defaultDaoFactoryAddress = process.env.DAO_FACTORY
|
||||
const defaultENSAddress = process.env.ENS
|
||||
|
||||
module.exports = async (
|
||||
truffleExecCallback,
|
||||
{
|
||||
artifacts = globalArtifacts,
|
||||
web3 = globalWeb3,
|
||||
ensAddress = defaultENSAddress,
|
||||
owner = defaultOwner,
|
||||
daoFactoryAddress = defaultDaoFactoryAddress,
|
||||
verbose = true
|
||||
} = {}
|
||||
) => {
|
||||
const log = (...args) => {
|
||||
if (verbose) { console.log(...args) }
|
||||
}
|
||||
|
||||
const APMRegistry = artifacts.require('APMRegistry')
|
||||
const Repo = artifacts.require('Repo')
|
||||
const ENSSubdomainRegistrar = artifacts.require('ENSSubdomainRegistrar')
|
||||
|
||||
const DAOFactory = artifacts.require('DAOFactory')
|
||||
const APMRegistryFactory = artifacts.require('APMRegistryFactory')
|
||||
const ENS = artifacts.require('ENS')
|
||||
|
||||
const tldName = 'eth'
|
||||
const labelName = 'open.aragonpm'
|
||||
const tldHash = namehash(tldName)
|
||||
const labelHash = '0x'+keccak256(labelName)
|
||||
const apmNode = namehash(`${labelName}.${tldName}`)
|
||||
|
||||
let ens
|
||||
|
||||
log('Deploying APM...')
|
||||
|
||||
const accounts = await getAccounts(web3)
|
||||
if (!owner) {
|
||||
owner = accounts[0]
|
||||
log('OWNER env variable not found, setting APM owner to the provider\'s first account')
|
||||
}
|
||||
log('Owner:', owner)
|
||||
|
||||
if (!ensAddress) {
|
||||
log('=========')
|
||||
log('Missing ENS! Deploying a custom ENS...')
|
||||
ens = (await deployENS(null, { artifacts, owner, verbose: false })).ens
|
||||
ensAddress = ens.address
|
||||
} else {
|
||||
ens = ENS.at(ensAddress)
|
||||
}
|
||||
|
||||
log('ENS:', ensAddress)
|
||||
log(`TLD: ${tldName} (${tldHash})`)
|
||||
log(`Label: ${labelName} (${labelHash})`)
|
||||
|
||||
log('=========')
|
||||
log('Deploying APM bases...')
|
||||
|
||||
const apmRegistryBase = await APMRegistry.new()
|
||||
await logDeploy(apmRegistryBase, { verbose })
|
||||
const apmRepoBase = await Repo.new()
|
||||
await logDeploy(apmRepoBase, { verbose })
|
||||
const ensSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
|
||||
await logDeploy(ensSubdomainRegistrarBase, { verbose })
|
||||
|
||||
let daoFactory
|
||||
if (daoFactoryAddress) {
|
||||
daoFactory = DAOFactory.at(daoFactoryAddress)
|
||||
const hasEVMScripts = await daoFactory.regFactory() !== ZERO_ADDR
|
||||
|
||||
log(`Using provided DAOFactory (with${hasEVMScripts ? '' : 'out' } EVMScripts):`, daoFactoryAddress)
|
||||
} else {
|
||||
log('Deploying DAOFactory with EVMScripts...')
|
||||
daoFactory = (await deployDaoFactory(null, { artifacts, withEvmScriptRegistryFactory: true, verbose: false })).daoFactory
|
||||
}
|
||||
|
||||
log('Deploying APMRegistryFactory...')
|
||||
const apmFactory = await APMRegistryFactory.new(
|
||||
daoFactory.address,
|
||||
apmRegistryBase.address,
|
||||
apmRepoBase.address,
|
||||
ensSubdomainRegistrarBase.address,
|
||||
ensAddress,
|
||||
'0x00'
|
||||
)
|
||||
await logDeploy(apmFactory, { verbose })
|
||||
|
||||
log(`Assigning ENS name (${labelName}.${tldName}) to factory...`)
|
||||
|
||||
if (await ens.owner(apmNode) === accounts[0]) {
|
||||
log('Transferring name ownership from deployer to APMRegistryFactory')
|
||||
await ens.setOwner(apmNode, apmFactory.address)
|
||||
} else {
|
||||
log('Creating subdomain and assigning it to APMRegistryFactory')
|
||||
try {
|
||||
await ens.setSubnodeOwner(tldHash, labelHash, apmFactory.address)
|
||||
} catch (err) {
|
||||
console.error(
|
||||
`Error: could not set the owner of '${labelName}.${tldName}' on the given ENS instance`,
|
||||
`(${ensAddress}). Make sure you have ownership rights over the subdomain.`
|
||||
)
|
||||
throw err
|
||||
}
|
||||
}
|
||||
|
||||
log('Deploying APM...')
|
||||
const receipt = await apmFactory.newAPM(tldHash, labelHash, owner)
|
||||
|
||||
log('=========')
|
||||
const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
|
||||
log('# APM:')
|
||||
log('Address:', apmAddr)
|
||||
log('Transaction hash:', receipt.tx)
|
||||
log('=========')
|
||||
|
||||
try {
|
||||
const kernel = await ensSubdomainRegistrarBase.kernel();
|
||||
const acl = await kernel.acl();
|
||||
console.log(acl);
|
||||
let ret = await ensSubdomainRegistrarBase.createNameAndPoint(labelHash, apmAddr).then(console.log).catch(console.log);
|
||||
console.log(ret);
|
||||
} catch(e) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if (typeof truffleExecCallback === 'function') {
|
||||
// Called directly via `truffle exec`
|
||||
truffleExecCallback()
|
||||
} else {
|
||||
return {
|
||||
apmFactory,
|
||||
ens,
|
||||
apm: APMRegistry.at(apmAddr),
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -35,9 +35,7 @@ module.exports = async function(callback) {
|
||||
}
|
||||
console.log(`Using DAOFactory at: ${daoFactory.address}`)
|
||||
|
||||
const apps = fs.readdirSync('./apps', { withFileTypes: true })
|
||||
.filter(e => e.isDirectory())
|
||||
.map(e => e.name);
|
||||
const apps = fs.readdirSync('./apps')
|
||||
console.log(`Found apps: [${apps}].${apm}`)
|
||||
let appIds = {}
|
||||
apps.sort().forEach((app) => {
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
// whatever npm does?! and for whatever this is needed..
|
||||
// https://github.com/aragon/aragon-cli/blob/master/packages/aragon-cli/scripts/fix-lockfile
|
||||
// https://github.com/aragon/aragon-cli/blob/master/docs-internal/Dependencies.md#regenerate-the-lockfiles
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
|
||||
function replaceAll(string, mapObject) {
|
||||
const regex = new RegExp(Object.keys(mapObject).join('|'), 'gi')
|
||||
let occurrences = 0
|
||||
const result = string.replace(regex, matched => {
|
||||
occurrences++
|
||||
return mapObject[matched]
|
||||
})
|
||||
console.log(`[fix-lockfile] Replaced ${occurrences} occurrences.`)
|
||||
return result
|
||||
}
|
||||
async function fixLockfile(path, replacementMap) {
|
||||
const originalJson = require(path)
|
||||
const originalText = JSON.stringify(originalJson, null, 2)
|
||||
const fixedText = replaceAll(originalText, replacementMap)
|
||||
const fixedJson = JSON.parse(fixedText)
|
||||
console.log('writing file', path);
|
||||
await fs.writeFileSync(path, JSON.stringify(fixedJson, null, 2))
|
||||
}
|
||||
//
|
||||
|
||||
const LOCKFILE_PATH = path.join(__dirname, '..', 'package-lock.json')
|
||||
|
||||
const replacementMap = {
|
||||
//
|
||||
'"version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
|
||||
'"version": "0.2.3"',
|
||||
//
|
||||
'"from": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
|
||||
'"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
|
||||
//
|
||||
'"from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
|
||||
'"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
|
||||
//
|
||||
'"async-eventemitter": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
|
||||
'"async-eventemitter": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
|
||||
}
|
||||
|
||||
fixLockfile(LOCKFILE_PATH, replacementMap)
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
cp -f scripts/git-hooks/pre-commit .git/hooks
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Run appropriate linter against staged files
|
||||
#
|
||||
if [ $(git diff --name-only --cached lib/ | wc -l) != 0 ]; then
|
||||
./node_modules/.bin/eslint lib/
|
||||
if [ $? != 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
# TODO master not linted yet, uncomment this when ready
|
||||
# if [ $(git diff --name-only --cached contracts/ | wc -l) != 0 ]; then
|
||||
# solhint contracts/**/*.sol && apps/*/contracts/**/*.sol
|
||||
# if [ $? != 0 ]; then
|
||||
# exit 1
|
||||
# fi
|
||||
# fi
|
||||
@@ -15,15 +15,13 @@ module.exports = async function(callback) {
|
||||
console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
|
||||
|
||||
const table = new Table({
|
||||
head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
|
||||
head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?']
|
||||
})
|
||||
|
||||
try {
|
||||
let blockNumber = await kredits.provider.getBlockNumber();
|
||||
let contributions = await kredits.Contribution.all({page: {size: 1000}});
|
||||
let contributions = await kredits.Contribution.all();
|
||||
|
||||
let kreditsSum = 0;
|
||||
console.log(`Current block number: ${blockNumber}`);
|
||||
contributions.forEach((c) => {
|
||||
const confirmed = c.confirmedAtBlock <= blockNumber;
|
||||
|
||||
@@ -32,18 +30,13 @@ module.exports = async function(callback) {
|
||||
c.contributorId,
|
||||
`${c.description}`,
|
||||
c.amount.toString(),
|
||||
`${confirmed} (${c.confirmedAtBlock})`,
|
||||
confirmed,
|
||||
c.vetoed,
|
||||
c.claimed,
|
||||
c.ipfsHash
|
||||
])
|
||||
});
|
||||
|
||||
console.log(table.toString());
|
||||
|
||||
let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
|
||||
let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
|
||||
console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
|
||||
@@ -15,31 +15,23 @@ module.exports = async function(callback) {
|
||||
|
||||
console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
|
||||
|
||||
|
||||
const table = new Table({
|
||||
head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'Kredits earned', 'Contributions count', 'IPFS']
|
||||
head: ['ID', 'Account', 'Core?', 'Name', 'Balance']
|
||||
})
|
||||
|
||||
try {
|
||||
const contributors = await kredits.Contributor.all()
|
||||
|
||||
contributors.forEach((c) => {
|
||||
table.push([
|
||||
c.id.toString(),
|
||||
c.account,
|
||||
`${c.name}`,
|
||||
c.isCore,
|
||||
c.balanceInt.toString(),
|
||||
c.totalKreditsEarned.toString(),
|
||||
c.contributionsCount.toString(),
|
||||
c.ipfsHash
|
||||
])
|
||||
})
|
||||
|
||||
console.log(table.toString())
|
||||
} catch(e) {
|
||||
callback(e);
|
||||
return;
|
||||
}
|
||||
let contributors = await kredits.Contributor.all()
|
||||
|
||||
contributors.forEach((c) => {
|
||||
table.push([
|
||||
c.id.toString(),
|
||||
c.account,
|
||||
c.isCore,
|
||||
`${c.name}`,
|
||||
ethers.utils.formatEther(c.balance)
|
||||
])
|
||||
})
|
||||
console.log(table.toString())
|
||||
callback()
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const ethers = require('ethers');
|
||||
const fileInject = require('./helpers/file_inject.js');
|
||||
const getNetworkId = require('./helpers/networkid.js');
|
||||
const KreditsKit = require('../lib/kreditskit');
|
||||
|
||||
const addressesPath = path.join(__dirname, '..', 'lib/addresses');
|
||||
|
||||
const KreditsKit = artifacts.require('KreditsKit')
|
||||
|
||||
module.exports = async function(callback) {
|
||||
const networkId = await getNetworkId(web3)
|
||||
console.log(`Deploying to networkId: ${networkId}`)
|
||||
@@ -20,21 +20,25 @@ module.exports = async function(callback) {
|
||||
}
|
||||
console.log(`Using KreditsKit at: ${kreditsKitAddress}`);
|
||||
|
||||
const provider = new ethers.providers.Web3Provider(web3.currentProvider);
|
||||
let signer = provider.getSigner();
|
||||
let kreditsKit = KreditsKit.at(kreditsKitAddress)
|
||||
|
||||
let kit = await new KreditsKit(provider, signer).init()
|
||||
kreditsKit.newInstance().then((ret) => {
|
||||
console.log(ret.logs);
|
||||
const installedEvents = ret.logs.filter(log => log.event === 'InstalledApp').map(log => log.args)
|
||||
const deployEvents = ret.logs.filter(log => log.event === 'DeployInstance').map(log => log.args)
|
||||
|
||||
// TODO: get rid of the hard coded gas limit
|
||||
kit.newDAO({ gasLimit: 10000000 }).then(result => {
|
||||
console.log(result);
|
||||
fileInject(path.join(addressesPath, 'dao.json'), networkId, result.daoAddress)
|
||||
if (deployEvents.length > 1) {
|
||||
callback(new Error("More than one DAO was deployed. Something is wrong"))
|
||||
}
|
||||
const daoAddress = deployEvents[0].dao;
|
||||
|
||||
console.log(`\n\nCreated new DAO at: ${result.daoAddress}`)
|
||||
fileInject(path.join(addressesPath, 'dao.json'), networkId, daoAddress)
|
||||
|
||||
console.log(`\n\nCreated new DAO at: ${daoAddress}`)
|
||||
|
||||
callback();
|
||||
}).catch((err) => {
|
||||
console.log('failed to create a new DAO')
|
||||
console.log('failed to create a new instance')
|
||||
callback(err)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -17,18 +17,13 @@ module.exports = async function(callback) {
|
||||
let fundingAmount = 2;
|
||||
each(seeds.funds, (address, next) => {
|
||||
console.log(`funding ${address} with 2 ETH`);
|
||||
try {
|
||||
web3.eth.personal.getAccounts().then(accounts => {
|
||||
web3.eth.personal.sendTransaction({
|
||||
to: address,
|
||||
from: accounts[0],
|
||||
value: web3.utils.toWei(new web3.utils.BN(fundingAmount))
|
||||
});
|
||||
});
|
||||
} catch(e) {
|
||||
console.log('FAILED:', e);
|
||||
}
|
||||
next();
|
||||
web3.eth.sendTransaction({
|
||||
to: address,
|
||||
value: web3.toWei(fundingAmount),
|
||||
from: web3.eth.accounts[0]
|
||||
},
|
||||
(result) => { next(); }
|
||||
)
|
||||
});
|
||||
|
||||
each(seeds.contractCalls, (call, next) => {
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
const promptly = require('promptly');
|
||||
const { inspect } = require('util');
|
||||
|
||||
const initKredits = require('./helpers/init_kredits.js');
|
||||
|
||||
module.exports = async function(callback) {
|
||||
let kredits;
|
||||
try { kredits = await initKredits(web3);
|
||||
} catch(e) { callback(e); return; }
|
||||
|
||||
console.log(`Using Contributions at: ${kredits.Contribution.contract.address}\n`);
|
||||
|
||||
let contributionId = await promptly.prompt('Contribution ID: ');
|
||||
|
||||
console.log(`Recording a veto for contribution #${contributionId}`);
|
||||
|
||||
try {
|
||||
kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
|
||||
.then(result => {
|
||||
console.log("\n\nResult:");
|
||||
console.log(result);
|
||||
callback();
|
||||
})
|
||||
.catch(error => {
|
||||
console.log('Failed to veto contribution');
|
||||
callback(inspect(error));
|
||||
});
|
||||
} catch(err) {
|
||||
console.log('Failed to veto contribution');
|
||||
callback(inspect(err));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user