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

Build on aragonOS #62

Merged
bumi merged 51 commits from aragonos into master 2019-04-02 19:36:36 +00:00
Conversation 39 Commits 51 Files Changed 121 +18 -7
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 116f69cb12 - Show all commits

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

@ -127,10 +127,9 @@ contract Contribution is AragonApp {
}
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) {

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 @@
bumi commented 2019-03-27 21:12:17 +00:00 (Migrated from github.com)
Review
Copy Link

I am wondering how I can prevent that those local address details get commited.
Those "14945560" network IDs are devchain IDs.
so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?

I am wondering how I can prevent that those local address details get commited. Those "14945560" network IDs are devchain IDs. so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?
bumi commented 2019-03-27 21:12:17 +00:00 (Migrated from github.com)
Review
Copy Link

I am wondering how I can prevent that those local address details get commited.
Those "14945560" network IDs are devchain IDs.
so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?

I am wondering how I can prevent that those local address details get commited. Those "14945560" network IDs are devchain IDs. so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?
fsmanuel commented 2019-03-28 17:16:51 +00:00 (Migrated from github.com)
Review
Copy Link

Maybe a git pre commit hook would work. I have never worked with git hooks...

Maybe a git pre commit hook would work. I have never worked with git hooks...
fsmanuel commented 2019-03-28 17:16:51 +00:00 (Migrated from github.com)
Review
Copy Link

Maybe a git pre commit hook would work. I have never worked with git hooks...

Maybe a git pre commit hook would work. I have never worked with git hooks...
raucao commented 2019-03-28 21:43:54 +00:00 (Migrated from github.com)
Review
Copy Link

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.
raucao commented 2019-03-28 21:43:54 +00:00 (Migrated from github.com)
Review
Copy Link

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.
bumi commented 2019-03-28 23:03:39 +00:00 (Migrated from github.com)
Review
Copy Link

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones.
so what would the hook do?

then it probably does not change that often...

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones. so what would the hook do? then it probably does not change that often...
bumi commented 2019-03-28 23:03:39 +00:00 (Migrated from github.com)
Review
Copy Link

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones.
so what would the hook do?

then it probably does not change that often...

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones. so what would the hook do? then it probably does not change that often...
{"23827572":"0xe4e0e7fe54d9189df29a80c07ab733fc9a212761","65047207":"0xdbe26ae4a434472a7474db60cc3e3c97a57bbf38"}
bumi commented 2019-03-27 21:12:17 +00:00 (Migrated from github.com)
Review
Copy Link

I am wondering how I can prevent that those local address details get commited.
Those "14945560" network IDs are devchain IDs.
so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?

I am wondering how I can prevent that those local address details get commited. Those "14945560" network IDs are devchain IDs. so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?
fsmanuel commented 2019-03-28 17:16:51 +00:00 (Migrated from github.com)
Review
Copy Link

Maybe a git pre commit hook would work. I have never worked with git hooks...

Maybe a git pre commit hook would work. I have never worked with git hooks...
raucao commented 2019-03-28 21:43:54 +00:00 (Migrated from github.com)
Review
Copy Link

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.
bumi commented 2019-03-28 23:03:39 +00:00 (Migrated from github.com)
Review
Copy Link

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones.
so what would the hook do?

then it probably does not change that often...

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones. so what would the hook do? then it probably does not change that often...
{"23827572":"0xe4e0e7fe54d9189df29a80c07ab733fc9a212761","65047207":"0xb67567175ac213f6f622b23d3d972d5b877c4813"}
bumi commented 2019-03-27 21:12:17 +00:00 (Migrated from github.com)
Review
Copy Link

I am wondering how I can prevent that those local address details get commited.
Those "14945560" network IDs are devchain IDs.
so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?

I am wondering how I can prevent that those local address details get commited. Those "14945560" network IDs are devchain IDs. so far I don't think it is worth to write code for that and maybe simply try to ignore commiting those changes, but if somebody has an idea...?
fsmanuel commented 2019-03-28 17:16:51 +00:00 (Migrated from github.com)
Review
Copy Link

Maybe a git pre commit hook would work. I have never worked with git hooks...

Maybe a git pre commit hook would work. I have never worked with git hooks...
raucao commented 2019-03-28 21:43:54 +00:00 (Migrated from github.com)
Review
Copy Link

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.

Yes, I think that could be a good solution. Git hooks are pretty easy to work with actually.
bumi commented 2019-03-28 23:03:39 +00:00 (Migrated from github.com)
Review
Copy Link

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones.
so what would the hook do?

then it probably does not change that often...

hmm. the issue is locally you need those addresses in the file but in the repo we only need the commonly used ones. so what would the hook do? then it probably does not change that often...

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 contributorId;
let contributorAccount;
if (contributor.length < 5) {
contributorId = contributor;
contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
} else {
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 = {
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 contributorId;
let contributorAccount;
if (contributor.length < 5) {
contributorId = contributor;
contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
} else {
contributorAccount = 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 = {
contributorId,

5
truffle.js
View File

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