Skip to content

Commit 4127daf

Browse files
authored
Competition Factory (#629)
* Competition Factory * lint * bump version
1 parent e58c1c5 commit 4127daf

File tree

12 files changed

+869
-73
lines changed

12 files changed

+869
-73
lines changed

daos/kovan/dummydao.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
{
2-
"name": "Gustatory Scenographer",
3-
"Avatar": "0x3d9E3F230E8ad18fBE7A8f9131e30579Be01fCD1",
4-
"DAOToken": "0x9ac1CE3fF16241B40F1B04AFFbede8dBAA3E3A57",
5-
"Reputation": "0xF135846012087e68DaC55A4C11550A1306875478",
6-
"Controller": "0x9363150ea59a9d317755973a201F14B9e6d1eC27",
2+
"name": "Nefarious Woodworkers",
3+
"Avatar": "0x353d169f3960c71339daea2F89260E26bAE398B3",
4+
"DAOToken": "0xAbDcdea10404e2E6229F24D64c073cCE238010b1",
5+
"Reputation": "0xa34b71e4706C41A48568Ae4838192d969BC2cE8B",
6+
"Controller": "0x5133F60Cf16aB51dcCf29c31F83D891E0DCB9BDE",
77
"Schemes": [
88
{
99
"name": "GenericScheme",
1010
"alias": "GenericSchemeAlias",
11-
"address": "0xB614b1720e23936fFF2Be5588E1fb935F91161CC",
12-
"arcVersion": "0.0.1-rc.47"
11+
"address": "0x01Fc899fa5e73D59F3DE73BB21298d43d75749b3",
12+
"arcVersion": "0.0.1-rc.55"
1313
},
1414
{
1515
"name": "ContributionRewardExt",
1616
"alias": "ContributionRewardExt",
17-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
17+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
1818
"arcVersion": "0.0.1-rc.43"
1919
},
2020
{
2121
"name": "GenericSchemeMultiCall",
2222
"alias": "GenericSchemeMultiCall",
23-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
24-
"arcVersion": "0.0.1-rc.47"
23+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
24+
"arcVersion": "0.0.1-rc.51"
2525
},
2626
{
2727
"name": "ContinuousLocking4Reputation",
2828
"alias": "ContinuousLocking4Reputation",
29-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
29+
"address": "0x65b52bcA12d6840f3AE32163E2A91fCb424edbE7",
3030
"arcVersion": "0.0.1-rc.55"
3131
}
3232
],
3333
"StandAloneContracts": [
3434
{
3535
"name": "Wallet",
36-
"address": "0x2b67199e1A34Db6892da2dA63628Be635F398eEb",
37-
"arcVersion": "0.0.1-rc.47"
36+
"address": "0x8dB34908fBA84F1c40E3A6C1cfEF70f45d3DEbdb",
37+
"arcVersion": "0.0.1-rc.55"
3838
},
3939
{
4040
"name": "ContributionRewardExt",
41-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
41+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
4242
"arcVersion": "0.0.1-rc.43"
4343
},
4444
{
4545
"name": "Competition",
46-
"address": "0xcE05e60546203Ab3ac82B42387C156103dc0E372",
46+
"address": "0x5446f6d6B40Dbb2a7AFC135B974ec693Bf43D29e",
4747
"arcVersion": "0.0.1-rc.43"
4848
},
4949
{
5050
"name": "GenericSchemeMultiCall",
51-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
52-
"arcVersion": "0.0.1-rc.47"
51+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
52+
"arcVersion": "0.0.1-rc.51"
5353
},
5454
{
5555
"name": "ActionMock",
56-
"address": "0x265ba47672C50e03c2C3DC756d625C3fde6D912c",
57-
"arcVersion": "0.0.1-rc.47"
56+
"address": "0x0944765A460b050E888782f9CFDcb13fB07428Ea",
57+
"arcVersion": "0.0.1-rc.55"
5858
},
5959
{
6060
"name": "DxDaoSchemeConstraints",
61-
"address": "0x9a56B2Fa2d204Ffe1419EC62BeAC31dddD760351",
62-
"arcVersion": "0.0.1-rc.47"
61+
"address": "0xe45eFAb753086BA36645f1850dbF535477E0f1e0",
62+
"arcVersion": "0.0.1-rc.51"
6363
}
6464
],
65-
"arcVersion": "0.0.1-rc.47"
65+
"arcVersion": "0.0.1-rc.55"
6666
}

daos/sokol/dummydao.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
{
2-
"name": "Gustatory Scenographer",
3-
"Avatar": "0x3d9E3F230E8ad18fBE7A8f9131e30579Be01fCD1",
4-
"DAOToken": "0x9ac1CE3fF16241B40F1B04AFFbede8dBAA3E3A57",
5-
"Reputation": "0xF135846012087e68DaC55A4C11550A1306875478",
6-
"Controller": "0x9363150ea59a9d317755973a201F14B9e6d1eC27",
2+
"name": "Nefarious Woodworkers",
3+
"Avatar": "0x353d169f3960c71339daea2F89260E26bAE398B3",
4+
"DAOToken": "0xAbDcdea10404e2E6229F24D64c073cCE238010b1",
5+
"Reputation": "0xa34b71e4706C41A48568Ae4838192d969BC2cE8B",
6+
"Controller": "0x5133F60Cf16aB51dcCf29c31F83D891E0DCB9BDE",
77
"Schemes": [
88
{
99
"name": "GenericScheme",
1010
"alias": "GenericSchemeAlias",
11-
"address": "0xB614b1720e23936fFF2Be5588E1fb935F91161CC",
12-
"arcVersion": "0.0.1-rc.47"
11+
"address": "0x01Fc899fa5e73D59F3DE73BB21298d43d75749b3",
12+
"arcVersion": "0.0.1-rc.55"
1313
},
1414
{
1515
"name": "ContributionRewardExt",
1616
"alias": "ContributionRewardExt",
17-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
17+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
1818
"arcVersion": "0.0.1-rc.43"
1919
},
2020
{
2121
"name": "GenericSchemeMultiCall",
2222
"alias": "GenericSchemeMultiCall",
23-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
24-
"arcVersion": "0.0.1-rc.47"
23+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
24+
"arcVersion": "0.0.1-rc.51"
2525
},
2626
{
2727
"name": "ContinuousLocking4Reputation",
2828
"alias": "ContinuousLocking4Reputation",
29-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
29+
"address": "0x65b52bcA12d6840f3AE32163E2A91fCb424edbE7",
3030
"arcVersion": "0.0.1-rc.55"
3131
}
3232
],
3333
"StandAloneContracts": [
3434
{
3535
"name": "Wallet",
36-
"address": "0x2b67199e1A34Db6892da2dA63628Be635F398eEb",
37-
"arcVersion": "0.0.1-rc.47"
36+
"address": "0x8dB34908fBA84F1c40E3A6C1cfEF70f45d3DEbdb",
37+
"arcVersion": "0.0.1-rc.55"
3838
},
3939
{
4040
"name": "ContributionRewardExt",
41-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
41+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
4242
"arcVersion": "0.0.1-rc.43"
4343
},
4444
{
4545
"name": "Competition",
46-
"address": "0xcE05e60546203Ab3ac82B42387C156103dc0E372",
46+
"address": "0x5446f6d6B40Dbb2a7AFC135B974ec693Bf43D29e",
4747
"arcVersion": "0.0.1-rc.43"
4848
},
4949
{
5050
"name": "GenericSchemeMultiCall",
51-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
52-
"arcVersion": "0.0.1-rc.47"
51+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
52+
"arcVersion": "0.0.1-rc.51"
5353
},
5454
{
5555
"name": "ActionMock",
56-
"address": "0x265ba47672C50e03c2C3DC756d625C3fde6D912c",
57-
"arcVersion": "0.0.1-rc.47"
56+
"address": "0x0944765A460b050E888782f9CFDcb13fB07428Ea",
57+
"arcVersion": "0.0.1-rc.55"
5858
},
5959
{
6060
"name": "DxDaoSchemeConstraints",
61-
"address": "0x9a56B2Fa2d204Ffe1419EC62BeAC31dddD760351",
62-
"arcVersion": "0.0.1-rc.47"
61+
"address": "0xe45eFAb753086BA36645f1850dbF535477E0f1e0",
62+
"arcVersion": "0.0.1-rc.51"
6363
}
6464
],
65-
"arcVersion": "0.0.1-rc.47"
65+
"arcVersion": "0.0.1-rc.55"
6666
}

daos/xdai/dummydao.json

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,66 @@
11
{
2-
"name": "Gustatory Scenographer",
3-
"Avatar": "0x3d9E3F230E8ad18fBE7A8f9131e30579Be01fCD1",
4-
"DAOToken": "0x9ac1CE3fF16241B40F1B04AFFbede8dBAA3E3A57",
5-
"Reputation": "0xF135846012087e68DaC55A4C11550A1306875478",
6-
"Controller": "0x9363150ea59a9d317755973a201F14B9e6d1eC27",
2+
"name": "Nefarious Woodworkers",
3+
"Avatar": "0x353d169f3960c71339daea2F89260E26bAE398B3",
4+
"DAOToken": "0xAbDcdea10404e2E6229F24D64c073cCE238010b1",
5+
"Reputation": "0xa34b71e4706C41A48568Ae4838192d969BC2cE8B",
6+
"Controller": "0x5133F60Cf16aB51dcCf29c31F83D891E0DCB9BDE",
77
"Schemes": [
88
{
99
"name": "GenericScheme",
1010
"alias": "GenericSchemeAlias",
11-
"address": "0xB614b1720e23936fFF2Be5588E1fb935F91161CC",
12-
"arcVersion": "0.0.1-rc.47"
11+
"address": "0x01Fc899fa5e73D59F3DE73BB21298d43d75749b3",
12+
"arcVersion": "0.0.1-rc.55"
1313
},
1414
{
1515
"name": "ContributionRewardExt",
1616
"alias": "ContributionRewardExt",
17-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
17+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
1818
"arcVersion": "0.0.1-rc.43"
1919
},
2020
{
2121
"name": "GenericSchemeMultiCall",
2222
"alias": "GenericSchemeMultiCall",
23-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
24-
"arcVersion": "0.0.1-rc.47"
23+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
24+
"arcVersion": "0.0.1-rc.51"
25+
},
26+
{
27+
"name": "ContinuousLocking4Reputation",
28+
"alias": "ContinuousLocking4Reputation",
29+
"address": "0x65b52bcA12d6840f3AE32163E2A91fCb424edbE7",
30+
"arcVersion": "0.0.1-rc.55"
2531
}
2632
],
2733
"StandAloneContracts": [
2834
{
2935
"name": "Wallet",
30-
"address": "0x2b67199e1A34Db6892da2dA63628Be635F398eEb",
31-
"arcVersion": "0.0.1-rc.47"
36+
"address": "0x8dB34908fBA84F1c40E3A6C1cfEF70f45d3DEbdb",
37+
"arcVersion": "0.0.1-rc.55"
3238
},
3339
{
3440
"name": "ContributionRewardExt",
35-
"address": "0x248b2B6DDDc29D88fEC5a8C18153F4cCCe3CA2Fb",
41+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
3642
"arcVersion": "0.0.1-rc.43"
3743
},
3844
{
3945
"name": "Competition",
40-
"address": "0xcE05e60546203Ab3ac82B42387C156103dc0E372",
46+
"address": "0x5446f6d6B40Dbb2a7AFC135B974ec693Bf43D29e",
4147
"arcVersion": "0.0.1-rc.43"
4248
},
4349
{
4450
"name": "GenericSchemeMultiCall",
45-
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
46-
"arcVersion": "0.0.1-rc.47"
51+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
52+
"arcVersion": "0.0.1-rc.51"
4753
},
4854
{
4955
"name": "ActionMock",
50-
"address": "0x265ba47672C50e03c2C3DC756d625C3fde6D912c",
51-
"arcVersion": "0.0.1-rc.47"
56+
"address": "0x0944765A460b050E888782f9CFDcb13fB07428Ea",
57+
"arcVersion": "0.0.1-rc.55"
5258
},
5359
{
5460
"name": "DxDaoSchemeConstraints",
55-
"address": "0x9a56B2Fa2d204Ffe1419EC62BeAC31dddD760351",
56-
"arcVersion": "0.0.1-rc.47"
61+
"address": "0xe45eFAb753086BA36645f1850dbF535477E0f1e0",
62+
"arcVersion": "0.0.1-rc.51"
5763
}
5864
],
59-
"arcVersion": "0.0.1-rc.47"
60-
}
65+
"arcVersion": "0.0.1-rc.55"
66+
}

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ services:
3131
environment:
3232
POSTGRES_PASSWORD: letmein
3333
ganache:
34-
image: 'daostack/migration:0.0.1-rc.55-v0'
34+
image: 'daostack/migration:0.0.1-rc.55-v1'
3535
ports:
3636
- '8545:8545'

ops/mappings.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,13 @@
792792
"mapping": "GenericSchemeMultiCallFactory",
793793
"arcVersion": "0.0.1-rc.55"
794794
},
795+
{
796+
"name": "CompetitionFactory",
797+
"contractName": "CompetitionFactory",
798+
"dao": "base",
799+
"mapping": "CompetitionFactory",
800+
"arcVersion": "0.0.1-rc.55"
801+
},
795802
{
796803
"name": "ContinuousLocking4ReputationFactory",
797804
"contractName": "ContinuousLocking4ReputationFactory",
@@ -999,6 +1006,13 @@
9991006
"mapping": "GenericSchemeMultiCallFactory",
10001007
"arcVersion": "0.0.1-rc.55"
10011008
},
1009+
{
1010+
"name": "CompetitionFactory",
1011+
"contractName": "CompetitionFactory",
1012+
"dao": "base",
1013+
"mapping": "CompetitionFactory",
1014+
"arcVersion": "0.0.1-rc.55"
1015+
},
10021016
{
10031017
"name": "ContinuousLocking4ReputationFactory",
10041018
"contractName": "ContinuousLocking4ReputationFactory",
@@ -1368,6 +1382,13 @@
13681382
"mapping": "GenericSchemeMultiCallFactory",
13691383
"arcVersion": "0.0.1-rc.55"
13701384
},
1385+
{
1386+
"name": "CompetitionFactory",
1387+
"contractName": "CompetitionFactory",
1388+
"dao": "base",
1389+
"mapping": "CompetitionFactory",
1390+
"arcVersion": "0.0.1-rc.55"
1391+
},
13711392
{
13721393
"name": "ContinuousLocking4ReputationFactory",
13731394
"contractName": "ContinuousLocking4ReputationFactory",
@@ -1946,6 +1967,13 @@
19461967
"mapping": "GenericSchemeMultiCallFactory",
19471968
"arcVersion": "0.0.1-rc.55"
19481969
},
1970+
{
1971+
"name": "CompetitionFactory",
1972+
"contractName": "CompetitionFactory",
1973+
"dao": "base",
1974+
"mapping": "CompetitionFactory",
1975+
"arcVersion": "0.0.1-rc.55"
1976+
},
19491977
{
19501978
"name": "ContinuousLocking4ReputationFactory",
19511979
"contractName": "ContinuousLocking4ReputationFactory",
@@ -2098,6 +2126,13 @@
20982126
"mapping": "GenericSchemeMultiCallFactory",
20992127
"arcVersion": "0.0.1-rc.55"
21002128
},
2129+
{
2130+
"name": "CompetitionFactory",
2131+
"contractName": "CompetitionFactory",
2132+
"dao": "base",
2133+
"mapping": "CompetitionFactory",
2134+
"arcVersion": "0.0.1-rc.55"
2135+
},
21012136
{
21022137
"name": "ContinuousLocking4ReputationFactory",
21032138
"contractName": "ContinuousLocking4ReputationFactory",

ops/templates.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@
2929
"name": "ContinuousLocking4Reputation",
3030
"mapping": "ContinuousLocking4Reputation",
3131
"start_arcVersion": "0.0.1-rc.55"
32+
},
33+
{
34+
"name": "Competition",
35+
"mapping": "Competition",
36+
"start_arcVersion": "0.0.1-rc.55"
37+
},
38+
{
39+
"name": "ContributionRewardExt",
40+
"mapping": "ContributionRewardExt",
41+
"start_arcVersion": "0.0.1-rc.55"
3242
}
3343
]
3444
}

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)