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

New nec #424

Merged
merged 2 commits into from
Dec 16, 2019
Merged

New nec #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495d53b
New nec
ben-kaufman Dec 16, 2019
790465a
Create dummydao.json
ben-kaufman Dec 16, 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
39 changes: 39 additions & 0 deletions daos/mainnet/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.36"
},
{
"name": "ContributionRewardExt",
"alias": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.36"
}
],
"StandAloneContracts": [
{
"name": "Wallet",
"address": "0x9AD84A087C55F61e116df9A8c474703E3D58c536",
"arcVersion": "0.0.1-rc.36"
},
{
"name": "ContributionRewardExt",
"address": "0x68c29524E583380aF7896f7e63463740225Ac026",
"arcVersion": "0.0.1-rc.36"
},
{
"name": "Competition",
"address": "0x4b7284ac4714e27F9098c57F54306ed74454D05F",
"arcVersion": "0.0.1-rc.36"
}
],
"arcVersion": "0.0.1-rc.36"
}
20 changes: 10 additions & 10 deletions daos/mainnet/nectardao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"name": "necDAO",
"Avatar": "0xB914983Fa9B6b34dAd7986D6B95A5C2BE47cCBBE",
"DAOToken": "0x117a00b33202fD07CC68c9c3F6259ad167Df8611",
"Reputation": "0x55214678b71d9447E4B21A186bA7adbaF5644087",
"Controller": "0x8C4452E14A179BC91C8e8DE9F636f47d9e0B1279",
"Avatar": "0xa0bCe1B03B7f1934580e445D6274e87e582149C1",
"DAOToken": "0xc9459C94205451090132caB73977749AFCF355F1",
"Reputation": "0x2a5383Adc12A84a684027F0af913e10CA0b28d73",
"Controller": "0xaA25D42930bfBe840BB05C0B09158D67AD9A4815",
"Schemes": [
{
"name": "GenericScheme",
"alias": "GenericSchemeENSPublicProvider",
"address": "0x0cD2573ed5117815704c585ee8644DD112bbfD16"
"address": "0x88B47e395c4AAF5d5028C69C4abdA9db057954e6"
},
{
"name": "GenericScheme",
"alias": "GenericSchemeENSRegistry",
"address": "0xC512bF9EaDBf7B131fB24056956e3654e7AA9511"
"address": "0x20599AF3822De8915FD035f91D4DA74b89877c45"
},
{
"name": "GenericScheme",
"alias": "GenericSchemeRegistryLookup",
"address": "0x025D7547D8d72491f89F61D4c4539580A35b8a58"
"address": "0x8fEeC2d4968C8883fF2f78706422e437F8b61D12"
},
{
"name": "ContinuousLocking4Reputation",
"alias": "InfiniteReputation4Token",
"address": "0x864A6C068F11F7EfB0f5129919159DED92885f14"
"address": "0xfF6710A04B38b1f5fB01d76ECbe1552fA91E9Ce6"
},
{
"name": "Auction4Reputation",
"alias": "GENAuction",
"address": "0x3e0f7f54caaCF716dE479F33d8914F39ACbA2D75"
"address": "0xb18787a67889f85C005Eb7C3Ac60Ea8c9AA656AF"
},
{
"name": "ReputationFromToken",
"alias": "ReputationFromToken",
"address": "0xcA72D68b2bE12eb7b44E0Dae988Ef1FDAe611337"
"address": "0xAB766B1358eb7EE3Df1D39A574b847624a5f7783"
}
],
"arcVersion": "0.0.1-rc.34"
Expand Down
4 changes: 3 additions & 1 deletion ops/generate-daos-subgraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ function daoYaml(contract, contractAddress, arcVersion) {
abis: (abis || [contract]).map(contractName => {
let _arcVersion = Number(arcVersion.slice(arcVersion.length-2,arcVersion.length));
if ((_arcVersion >= 34) && (contractName === "UGenericScheme")) {
throw Error(`Contract UGenericScheme is not supported for Arc version 34+.`)
return {name: contractName,
file: path.resolve(`./abis/0.0.1-rc.33/UGenericScheme.json`)
};
}
if ((_arcVersion < 24) && (contractName === "UGenericScheme")) {
return {name: contractName,
Expand Down
109 changes: 100 additions & 9 deletions ops/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,8 +961,8 @@
]
},
"mainnet":
{
"mappings": [
{
"mappings": [
{
"name": "GenesisProtocol",
"contractName": "GenesisProtocol",
Expand Down Expand Up @@ -1047,20 +1047,104 @@
"mapping": "DAORegistry",
"arcVersion": "0.0.1-rc.19"
},
{
"name": "GenesisProtocol",
"contractName": "GenesisProtocol",
"dao": "base",
"mapping": "GenesisProtocol",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "ContributionReward",
"contractName": "ContributionReward",
"dao": "base",
"mapping": "ContributionReward",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "UGenericScheme",
"contractName": "GenericScheme",
"dao": "base",
"mapping": "UGenericScheme",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "SchemeRegistrar",
"contractName": "SchemeRegistrar",
"dao": "base",
"mapping": "SchemeRegistrar",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "UController",
"contractName": "UController",
"dao": "base",
"mapping": "UController",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "DAORegistry",
"contractName": "DAORegistry",
"dao": "base",
"mapping": "DAORegistry",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "DAORegistry",
"contractName": "DAORegistry",
"dao": "base",
"mapping": "DAORegistry",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "Redeemer",
"contractName": "Redeemer",
"dao": "base",
"mapping": "Redeemer",
"arcVersion": "0.0.1-rc.22"
},
{
"name": "GenesisProtocol",
"contractName": "GenesisProtocol",
"dao": "base",
"mapping": "GenesisProtocol",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "ContributionReward",
"contractName": "ContributionReward",
"dao": "base",
"mapping": "ContributionReward",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "UGenericScheme",
"contractName": "UGenericScheme",
"dao": "base",
"mapping": "UGenericScheme",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "SchemeRegistrar",
"contractName": "SchemeRegistrar",
"dao": "base",
"mapping": "SchemeRegistrar",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "UController",
"contractName": "UController",
"dao": "base",
"mapping": "UController",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "DAORegistry",
"contractName": "DAORegistry",
"dao": "base",
"mapping": "DAORegistry",
"arcVersion": "0.0.1-rc.27"
},
{
"name": "GenesisProtocol",
"contractName": "GenesisProtocol",
Expand Down Expand Up @@ -1104,11 +1188,11 @@
"arcVersion": "0.0.1-rc.30"
},
{
"name": "DAOTracker",
"contractName": "DAOTracker",
"name": "Redeemer",
"contractName": "Redeemer",
"dao": "base",
"mapping": "DAOTracker",
"arcVersion": "0.0.1-rc.32"
"mapping": "Redeemer",
"arcVersion": "0.0.1-rc.30"
},
{
"name": "GenesisProtocol",
Expand Down Expand Up @@ -1174,10 +1258,10 @@
"arcVersion": "0.0.1-rc.34"
},
{
"name": "Redeemer",
"contractName": "Redeemer",
"name": "DAORegistry",
"contractName": "DAORegistry",
"dao": "base",
"mapping": "Redeemer",
"mapping": "DAORegistry",
"arcVersion": "0.0.1-rc.34"
},
{
Expand All @@ -1186,6 +1270,13 @@
"dao": "base",
"mapping": "DAOTracker",
"arcVersion": "0.0.1-rc.34"
},
{
"name": "Redeemer",
"contractName": "Redeemer",
"dao": "base",
"mapping": "Redeemer",
"arcVersion": "0.0.1-rc.34"
}
]
}
Expand Down