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

Jump to bottom

BuffiDAO #462

Merged
merged 3 commits into from
Feb 4, 2020
Merged

BuffiDAO #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981235f
BuffiDAO
ben-kaufman Feb 2, 2020
0f33402
sokol support
ben-kaufman Feb 2, 2020
05629ea
Update migration
ben-kaufman Feb 2, 2020
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
45 changes: 45 additions & 0 deletions daos/mainnet/buffidao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "BuffiDAO",
"Avatar": "0x45cF7D5c503B6417d570929368b8f4c4567aD9Eb",
"DAOToken": "0x62BB92a45e4132449cAB13670d858d9320b3F9Df",
"Reputation": "0x1d995A9898D20923DB530d7aA505FB418e7c72dD",
"Controller": "0x70898C9c222A8221B4445498eF3F7cEC995b3768",
"Schemes": [
{
"name": "ReputationFromToken",
"alias": "ReputationFromToken",
"address": "0x6A0c2D5F8fd6c0D25081e905341C28BfA90bB8eA",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0xF8AfC6106b91545171ecdc13aCb48AB5f6363702",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ReputationAdmin",
"alias": "ReputationAdmin",
"address": "0x0Ea2836Fe6612e79f8380a2eC8Df18022a67A28b",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "ContributionRewardExt",
"address": "0xF8AfC6106b91545171ecdc13aCb48AB5f6363702",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0xFE0BE41f95A98CfA9D3FD4cCc57fB99B75545ced",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "RepAllocation",
"address": "0x896e70f77FC1B58DBfC6674DFaDAF4C414fbceBc",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
2 changes: 1 addition & 1 deletion daos/private/testdao16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Rhadamanthine Inker",
"name": "Hubristic Trampoline",
"Avatar": "0xE7A2C59e134ee81D4035Ae6DB2254f79308e334f",
"DAOToken": "0xcDbe8b52A6c60A5f101d4A0F1f049f19a9e1D35F",
"Reputation": "0x93cdbf39fB9e13BD253CA5819247D52fbabf0F2f",
Expand Down
2 changes: 1 addition & 1 deletion daos/private/testdao19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Cerulean Soaper",
"name": "Strident Potato",
"Avatar": "0xf88E4C158298323a85dD7678eD60DBfF6DA71007",
"DAOToken": "0xa09Cd74C747bf9DDB9154B1C75e271Dd12E45224",
"Reputation": "0x5E06A0d7BA9728E3B3140857B26fFD6626D66793",
Expand Down
2 changes: 1 addition & 1 deletion daos/private/testdao32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Ruminative Plant operator",
"name": "Precipitate Cupcake",
"Avatar": "0x98CcB5051fD767e2E89567bCCCA4Efc532250544",
"DAOToken": "0x30dB4905b474aff3e1EAfc60394ece85dC524A92",
"Reputation": "0x4992595a747d772bF291f64112735064BFc8878f",
Expand Down
2 changes: 1 addition & 1 deletion daos/private/testdao33.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Defamatory Curtains",
"name": "Uxorious Penciller",
"Avatar": "0x2268317B403ADEc49Fde9241a977335aba406A55",
"DAOToken": "0x78B7beA9fB68616E4520DC2F522833616f6413d5",
"Reputation": "0x0819C56Db86FbC6Cb3e0ef63F7DF0c4d5e60d915",
Expand Down
2 changes: 1 addition & 1 deletion daos/private/testdao39.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Contumacious Musician",
"name": "Obtuse Moldmaker",
"Avatar": "0x69c348135B7540cfdCeE5E19CA5A20C9d13a83E8",
"DAOToken": "0x98d97291de7dE044e1D60f75ace66baE1Ba7cd40",
"Reputation": "0xCbc18888E47C555cdEf4D8C68cA90BcABCdA04B9",
Expand Down
45 changes: 45 additions & 0 deletions daos/rinkeby/buffidao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "BuffiDAO",
"Avatar": "0x123F3722CF8cfCeCC6EE833b08E895516EB36F31",
"DAOToken": "0x88888caB4C195aAD4E4df7983896C498fFFc2c85",
"Reputation": "0x9C1Fd939A7574Ea83Fe9BAEd9f9DAB1Ea433B2ce",
"Controller": "0x94d14eCB70c80E4c64C2Ec8dB569C5C543829CD0",
"Schemes": [
{
"name": "ReputationFromToken",
"alias": "ReputationFromToken",
"address": "0x38Bdbcd795B44d937522Ab9E3c25Fc219C2C3e0C",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0x308Ba661BdB8444a1718FB8B0Cf4eFe4e7bBAf64",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ReputationAdmin",
"alias": "ReputationAdmin",
"address": "0x28d7ECC5a3488DE05a82Ea7DC1CB68f07B81D6f3",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "ContributionRewardExt",
"address": "0x308Ba661BdB8444a1718FB8B0Cf4eFe4e7bBAf64",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0xe4DF017D1Ee7845D45991e55f040A0619188137a",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "RepAllocation",
"address": "0x4126c936C227Cb10e455be7859A516e1741D27b7",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
45 changes: 45 additions & 0 deletions daos/sokol/buffidao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "BuffiDAO",
"Avatar": "0xFe66DbE392C5825A7d4bd251b36e117b961Cb6d7",
"DAOToken": "0x8627eB75Dc68411F1f71E8587DA9d2cdeDA2f853",
"Reputation": "0x8A01fb57081fEc0Da02cC6c7C635Fa113a1345cF",
"Controller": "0x2Ad2A4CA582d408C8F620F0898B7421B82D08836",
"Schemes": [
{
"name": "ReputationFromToken",
"alias": "ReputationFromToken",
"address": "0x33Ac64Fc3c23D1FaE4F448B127c4B1d1AaBE30e7",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0x1f6E0a3dCADBcd86E5dC5f7157b5802035CF59d1",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ReputationAdmin",
"alias": "ReputationAdmin",
"address": "0x0b8560095271c5D5264440dEAFF2c4eEd18ba180",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "ContributionRewardExt",
"address": "0x1f6E0a3dCADBcd86E5dC5f7157b5802035CF59d1",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0x3470af3AD6e93e7EB58e7b7B8f7F9C9277459c82",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "RepAllocation",
"address": "0xA96BC14085073c81b23169a6AaA2920056ac2f0d",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
39 changes: 39 additions & 0 deletions daos/sokol/dummydao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "Parsimonious Designer",
"Avatar": "0x46e342972535e15776Cf31f9407975f3E8A4078c",
"DAOToken": "0x1f1DFd38F0cc6C1c7d2516d9aA9f99a4192C7249",
"Reputation": "0x3AFEebAb0eA2D0A31BB882d3C1a6B6f0C8dE4859",
"Controller": "0x9Ef023Ca8D27076b6b3823aA1108E0f03bfF9800",
"Schemes": [
{
"name": "GenericScheme",
"alias": "GenericSchemeAlias",
"address": "0x38d2AD56A9F589c2d6f0a330291F79BfF9B13C6d",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "Wallet",
"address": "0x9AD84A087C55F61e116df9A8c474703E3D58c536",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0x4b7284ac4714e27F9098c57F54306ed74454D05F",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
45 changes: 45 additions & 0 deletions daos/xdai/buffidao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "BuffiDAO",
"Avatar": "0x95BF39CfBC8aa2dAB5c6eC436985406Bfc5B3513",
"DAOToken": "0x06C5Aa441D33C39c28749223AdA0E7d91bD84210",
"Reputation": "0x5cA68590066d22523050f1fa3BDFA815d2d556E5",
"Controller": "0x8097459fa512c3f6E8Aac75D048320B61d19F670",
"Schemes": [
{
"name": "ReputationFromToken",
"alias": "ReputationFromToken",
"address": "0xD4a6d1c12a736643A95532B54e3D011168201FF2",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0xF6C8A7E28acDE3C81A0F0a36F0d7018F13B60FC0",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ReputationAdmin",
"alias": "ReputationAdmin",
"address": "0xE1879b7767bED4a798B94D25c70BAD28989E7659",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "ContributionRewardExt",
"address": "0xF6C8A7E28acDE3C81A0F0a36F0d7018F13B60FC0",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0xC8FcD649c5872fd08A39274dF953254fBafDa9fC",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "RepAllocation",
"address": "0x35FEd85A6D2547804b5FeEa381A4dECF55a1527b",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
39 changes: 39 additions & 0 deletions daos/xdai/dummydao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "Parsimonious Designer",
"Avatar": "0x46e342972535e15776Cf31f9407975f3E8A4078c",
"DAOToken": "0x1f1DFd38F0cc6C1c7d2516d9aA9f99a4192C7249",
"Reputation": "0x3AFEebAb0eA2D0A31BB882d3C1a6B6f0C8dE4859",
"Controller": "0x9Ef023Ca8D27076b6b3823aA1108E0f03bfF9800",
"Schemes": [
{
"name": "GenericScheme",
"alias": "GenericSchemeAlias",
"address": "0x38d2AD56A9F589c2d6f0a330291F79BfF9B13C6d",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.39"
}
],
"StandAloneContracts": [
{
"name": "Wallet",
"address": "0x9AD84A087C55F61e116df9A8c474703E3D58c536",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.39"
},
{
"name": "Competition",
"address": "0x4b7284ac4714e27F9098c57F54306ed74454D05F",
"arcVersion": "0.0.1-rc.39"
}
],
"arcVersion": "0.0.1-rc.39"
}
39 changes: 0 additions & 39 deletions daos/xdai/testdao.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ services:
environment:
POSTGRES_PASSWORD: letmein
ganache:
image: 'daostack/migration:0.0.1-rc.39-v2'
image: 'daostack/migration:0.0.1-rc.39-v3'
ports:
- '8545:8545'
3 changes: 2 additions & 1 deletion ops/blacklist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"kovan": [],
"rinkeby": [],
"mainnet": [],
"xdai": []
"xdai": [],
"sokol": []
}
6 changes: 3 additions & 3 deletions ops/generate-subgraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ async function generateSubgraph(opts={}) {
opts.subgraphLocation = opts.subgraphLocation || defaultSubgraphLocation;
const addresses = JSON.parse(fs.readFileSync(migrationFile, "utf-8"));
const missingAddresses = {};
if (network === 'xdai') {
if (network === 'xdai' || network === 'sokol' ) {
mappings.push( //workaround :(
{name: 'UGenericScheme',
contractName: 'UGenericScheme',
dao: 'base',
mapping: 'UGenericScheme',
arcVersion: '0.0.1-rc.37' });
addresses[network].base['0.0.1-rc.37']['UGenericScheme'] = "0xA92A766d62318B9c06Eb548753bD34acbD7C5f3c" //dummy
arcVersion: '0.0.1-rc.39' });
addresses[network].base['0.0.1-rc.39']['UGenericScheme'] = "0xA92A766d62318B9c06Eb548753bD34acbD7C5f3c" //dummy
}

// Filter out 0.0.1-rc.18 & 0.0.1-rc.17
Expand Down
Loading