Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge @next changes #61

Merged
merged 6 commits into from
Mar 13, 2019
Merged

Merge @next changes #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0164cad
feat(Beta): allow different name for token and organization (#58)
sohkai Jan 8, 2019
43a5561
chore: upgrade @aragon/os
sohkai Feb 11, 2019
7718b6f
chore: pin AGP-1 kit's dependencies since it's not meant to be redepl…
sohkai Mar 8, 2019
3375665
chore: update @aragon/os dependency
sohkai Mar 8, 2019
14d2963
chore: pin AGP-1 kit's truffle version to 4.1.14
sohkai Mar 9, 2019
1a20e65
chore: fix cosmetic linting regressions
sohkai Mar 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions kits/agp1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
"dependencies": {
"@aragon/apps-shared-minime": "^1.0.0",
"@aragon/apps-shared-migrations": "^1.0.0",
"@aragon/apps-finance": "^2.1.0",
"@aragon/apps-vault": "^4.0.0",
"@aragon/apps-voting": "^2.0.0",
"@aragon/kits-base": "^1.0.0",
"@aragon/os": "^4.0.1",
"eth-ens-namehash": "^2.0.8"
"@aragon/apps-finance": "2.1.0",
"@aragon/apps-vault": "4.0.0",
"@aragon/apps-voting": "2.0.0",
"@aragon/kits-base": "1.0.0",
"@aragon/os": "4.0.1"
},
"devDependencies": {
"@aragon/test-helpers": "^1.0.0",
"@aragon/kits-beta-base": "^1.0.0",
"eth-ens-namehash": "^2.0.8",
"solium": "^1.0.4",
"truffle": "^4.1.14"
"truffle": "4.1.14"
}
}
2 changes: 1 addition & 1 deletion kits/bare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"deploy:kit:mainnet": "aragon contracts compile --all && aragon contracts exec --network mainnet scripts/deploy.js"
},
"dependencies": {
"@aragon/os": "^4.0.0",
"@aragon/os": "^4.1.0",
"@aragon/kits-base": "^1.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion kits/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"author": "Aragon Association <legal@aragon.org>",
"license": "GPL-3.0-or-later",
"dependencies": {
"@aragon/os": "^4.0.0"
"@aragon/os": "^4.1.0"
}
}
4 changes: 2 additions & 2 deletions kits/beta-base/contracts/BetaKitBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ contract BetaKitBase is KitBase, IsContract {
}

function createDAO(
string name,
string aragonId,
MiniMeToken token,
address[] holders,
uint256[] stakes,
Expand Down Expand Up @@ -140,7 +140,7 @@ contract BetaKitBase is KitBase, IsContract {
cleanupPermission(acl, voting, dao, dao.APP_MANAGER_ROLE());
cleanupPermission(acl, voting, tokenManager, tokenManager.MINT_ROLE());

registerAragonID(name, dao);
registerAragonID(aragonId, dao);
emit DeployInstance(dao, token);

return (dao, acl, finance, tokenManager, vault, voting);
Expand Down
4 changes: 3 additions & 1 deletion kits/beta-base/contracts/test/mocks/BetaTemplateBaseMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ contract BetaKitBaseMock is BetaKitBase {
)
BetaKitBase(_fac, _ens, _minimeFac, _aragonID, _appIds)
public
{}
{
// solium-disable-previous-line no-empty-blocks
}

function newToken(string name, string symbol) external returns (MiniMeToken token) {
token = minimeFac.createCloneToken(
Expand Down
2 changes: 1 addition & 1 deletion kits/beta-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"truffle": "4.1.14"
},
"dependencies": {
"@aragon/os": "^4.0.1",
"@aragon/os": "^4.1.0",
"@aragon/apps-shared-minime": "^1.0.0",
"@aragon/apps-shared-migrations": "^1.0.0",
"@aragon/apps-voting": "^2.0.0",
Expand Down
23 changes: 13 additions & 10 deletions kits/democracy/contracts/DemocracyKit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,24 @@ contract DemocracyKit is BetaKitBase {
)
BetaKitBase(_fac, _ens, _minimeFac, _aragonID, _appIds)
public
{}
{
// solium-disable-previous-line no-empty-blocks
}

function newTokenAndInstance(
string name,
string symbol,
string tokenName,
string tokenSymbol,
string aragonId,
address[] holders,
uint256[] tokens,
uint64 supportNeeded,
uint64 minAcceptanceQuorum,
uint64 voteDuration
) public
{
newToken(name, symbol);
newToken(tokenName, tokenSymbol);
newInstance(
name,
aragonId,
holders,
tokens,
supportNeeded,
Expand All @@ -36,20 +39,20 @@ contract DemocracyKit is BetaKitBase {
);
}

function newToken(string name, string symbol) public returns (MiniMeToken token) {
function newToken(string tokenName, string tokenSymbol) public returns (MiniMeToken token) {
token = minimeFac.createCloneToken(
MiniMeToken(address(0)),
0,
name,
tokenName,
18,
symbol,
tokenSymbol,
true
);
cacheToken(token, msg.sender);
}

function newInstance(
string name,
string aragonId,
address[] holders,
uint256[] tokens,
uint64 supportNeeded,
Expand All @@ -65,7 +68,7 @@ contract DemocracyKit is BetaKitBase {
ACL acl;
Voting voting;
(dao, acl, , , , voting) = createDAO(
name,
aragonId,
token,
holders,
tokens,
Expand Down
2 changes: 1 addition & 1 deletion kits/democracy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"truffle-hdwallet-provider": "0.0.3"
},
"dependencies": {
"@aragon/os": "^4.0.1",
"@aragon/os": "^4.1.0",
"@aragon/apps-shared-minime": "^1.0.0",
"@aragon/apps-shared-migrations": "^1.0.0",
"@aragon/apps-voting": "^2.0.0",
Expand Down
Loading