kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

cleanup

Browse Source
This commit is contained in:
bumi 2019-03-24 00:20:48 +01:00
parent 6c569239de
commit 116f69cb12
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/contribution/contracts/Contribution.sol
View File

@ -127,10 +127,9 @@ contract Contribution is AragonApp {
} }
function getTokenContract() public view returns (address) { function getTokenContract() public view returns (address) {
return 0x8779fc70eeea01d00efa9044c29d3c930fdb874a; IKernel k = IKernel(kernel());
//IKernel k = IKernel(kernel());
//return k.getApp(KERNEL_APP_ADDR_NAMESPACE, TOKEN_APP_ID); return k.getApp(KERNEL_APP_ADDR_NAMESPACE, TOKEN_APP_ID);
} }
function exists(uint256 contributionId) view public returns (bool) { function exists(uint256 contributionId) view public returns (bool) {

2
lib/abis/Token.json
View File

File diff suppressed because one or more lines are too long

2
lib/addresses/dao.json
View File

@ -1 +1 @@
{"23827572":"0xe4e0e7fe54d9189df29a80c07ab733fc9a212761","65047207":"0xdbe26ae4a434472a7474db60cc3e3c97a57bbf38"} {"23827572":"0xe4e0e7fe54d9189df29a80c07ab733fc9a212761","65047207":"0xb67567175ac213f6f622b23d3d972d5b877c4813"}

6
scripts/add-contribution.js
View File

@ -14,12 +14,16 @@ module.exports = async function(callback) {
let contributor = await promptly.prompt('Contributor (address or id): '); let contributor = await promptly.prompt('Contributor (address or id): ');
let contributorId; let contributorId;
let contributorAccount;
if (contributor.length < 5) { if (contributor.length < 5) {
contributorId = contributor;
contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor); contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
} else { } else {
contributorAccount = contributor; contributorAccount = contributor;
contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
} }
console.log(`Creating a contribution for contributor Account #${contributorAccount}`);
console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
let contributionAttributes = { let contributionAttributes = {
contributorAccount, contributorAccount,

5
scripts/add-proposal.js
View File

@ -14,12 +14,15 @@ module.exports = async function(callback) {
let contributor = await promptly.prompt('Contributor (address or id): '); let contributor = await promptly.prompt('Contributor (address or id): ');
let contributorId; let contributorId;
let contributorAccount;
if (contributor.length < 5) { if (contributor.length < 5) {
contributorId = contributor; contributorId = contributor;
contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
} else { } else {
contributorAccount = contributor;
contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor); contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
} }
console.log(`Creating a proposal for contributor ID #${contributorId}`); console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
let contributionAttributes = { let contributionAttributes = {
contributorId, contributorId,

5
truffle.js
View File

@ -64,5 +64,10 @@ module.exports = {
network_id: 4, network_id: 4,
provider: providerForNetwork('rinkeby') provider: providerForNetwork('rinkeby')
} }
},
compilers: {
solc: {
version: "0.4.24"
}
} }
} }