Skip to content

Commit d17bedd

Browse files
ben-kaufmanben-kaufman
authored
CL4R (#628)
* CL4R * Delete ContinuousLocking4Reputation.spec.ts * save * Factory and tests * fixes
1 parent 31b3385 commit d17bedd

32 files changed

+708
-89
lines changed

‎daos/kovan/dummydao.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
"alias": "GenericSchemeMultiCall",
2323
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
2424
"arcVersion": "0.0.1-rc.47"
25+
},
26+
{
27+
"name": "ContinuousLocking4Reputation",
28+
"alias": "ContinuousLocking4Reputation",
29+
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
30+
"arcVersion": "0.0.1-rc.55"
2531
}
2632
],
2733
"StandAloneContracts": [

‎daos/mainnet/dummydao.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
"alias": "GenericSchemeMultiCall",
2323
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
2424
"arcVersion": "0.0.1-rc.47"
25+
},
26+
{
27+
"name": "ContinuousLocking4Reputation",
28+
"alias": "ContinuousLocking4Reputation",
29+
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
30+
"arcVersion": "0.0.1-rc.55"
2531
}
2632
],
2733
"StandAloneContracts": [

‎daos/private/testdao16.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Concomitant Nibblets",
2+
"name": "Comely Carousel",
33
"Avatar": "0xE7A2C59e134ee81D4035Ae6DB2254f79308e334f",
44
"DAOToken": "0xcDbe8b52A6c60A5f101d4A0F1f049f19a9e1D35F",
55
"Reputation": "0x93cdbf39fB9e13BD253CA5819247D52fbabf0F2f",
@@ -21,7 +21,7 @@
2121
"name": "ContinuousLocking4Reputation",
2222
"alias": "ContinuousLocking4Reputation",
2323
"address": "0xf19A2A01B70519f67ADb309a994Ec8c69A967E8b",
24-
"arcVersion": "0.0.1-rc.51"
24+
"arcVersion": "0.0.1-rc.55"
2525
}
2626
],
2727
"StandAloneContracts": [

‎daos/private/testdao19.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Ubiquitous Animator",
2+
"name": "Munificent Pancake",
33
"Avatar": "0xb504490A5017413D014DD97916C3FFf889D555b5",
44
"DAOToken": "0xAAEd128A9572E981A405543aFFEf60E2BC3AF07A",
55
"Reputation": "0xb000e6d46e178c6784586E6e1aB440A7d1c1d9da",
@@ -21,7 +21,7 @@
2121
"name": "ContinuousLocking4Reputation",
2222
"alias": "ContinuousLocking4Reputation",
2323
"address": "0x352ebD84619597F4ec3d18Bea793143eAa2f4c46",
24-
"arcVersion": "0.0.1-rc.51"
24+
"arcVersion": "0.0.1-rc.55"
2525
}
2626
],
2727
"StandAloneContracts": [

‎daos/private/testdao32.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Irksome Stick figures",
2+
"name": "Dowdy Flatter",
33
"Avatar": "0x670342000f14eF31bc98f8239829618B0D6f18E4",
44
"DAOToken": "0x5c5970aa0EDEcBBD9075cF8aa93754Aa800DCfc4",
55
"Reputation": "0xC4aD251A22F774F7C056318A89F18E72dbAac683",
@@ -27,7 +27,7 @@
2727
"name": "ContinuousLocking4Reputation",
2828
"alias": "ContinuousLocking4Reputation",
2929
"address": "0xDe269cA74A01f84248FAdeb7C856d06cF9c68E09",
30-
"arcVersion": "0.0.1-rc.51"
30+
"arcVersion": "0.0.1-rc.55"
3131
}
3232
],
3333
"StandAloneContracts": [

‎daos/private/testdao33.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Friable Beets",
2+
"name": "Platitudinous Salad",
33
"Avatar": "0x31e897BBc421b5D233BC343B7d88121589fc0513",
44
"DAOToken": "0x56B720e202A2ef253c5968e0e0f5661c1f7408c2",
55
"Reputation": "0x1a1BDc2581D4bC796dfbB500A77Cc86A7b44CC87",
@@ -27,7 +27,7 @@
2727
"name": "ContinuousLocking4Reputation",
2828
"alias": "ContinuousLocking4Reputation",
2929
"address": "0xb9e3Dd112BCc6e89546c46ABb1573cf9c62C3241",
30-
"arcVersion": "0.0.1-rc.51"
30+
"arcVersion": "0.0.1-rc.55"
3131
}
3232
],
3333
"StandAloneContracts": [

‎daos/private/testdao41.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Arcadian Flatter",
2+
"name": "Comely Glitter",
33
"Avatar": "0x79587259c3141bDc79f5AEfFDFE219fcBA2c5740",
44
"DAOToken": "0xbFE4cE5729a4E9e193EFABB538F95556A3fC5f5d",
55
"Reputation": "0xFffCE877f57272F13f0Dc606B9525c0dF72AA78d",
@@ -27,7 +27,7 @@
2727
"name": "ContinuousLocking4Reputation",
2828
"alias": "ContinuousLocking4Reputation",
2929
"address": "0x03f40E33bdc51750B24bab0DB5B38E50227261D1",
30-
"arcVersion": "0.0.1-rc.51"
30+
"arcVersion": "0.0.1-rc.55"
3131
}
3232
],
3333
"StandAloneContracts": [

‎daos/private/testdao55.json

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "Nefarious Woodworkers",
3+
"Avatar": "0x353d169f3960c71339daea2F89260E26bAE398B3",
4+
"DAOToken": "0xAbDcdea10404e2E6229F24D64c073cCE238010b1",
5+
"Reputation": "0xa34b71e4706C41A48568Ae4838192d969BC2cE8B",
6+
"Controller": "0x5133F60Cf16aB51dcCf29c31F83D891E0DCB9BDE",
7+
"Schemes": [
8+
{
9+
"name": "GenericScheme",
10+
"alias": "GenericSchemeAlias",
11+
"address": "0x01Fc899fa5e73D59F3DE73BB21298d43d75749b3",
12+
"arcVersion": "0.0.1-rc.55"
13+
},
14+
{
15+
"name": "ContributionRewardExt",
16+
"alias": "ContributionRewardExt",
17+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
18+
"arcVersion": "0.0.1-rc.43"
19+
},
20+
{
21+
"name": "GenericSchemeMultiCall",
22+
"alias": "GenericSchemeMultiCall",
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"
31+
}
32+
],
33+
"StandAloneContracts": [
34+
{
35+
"name": "Wallet",
36+
"address": "0x8dB34908fBA84F1c40E3A6C1cfEF70f45d3DEbdb",
37+
"arcVersion": "0.0.1-rc.55"
38+
},
39+
{
40+
"name": "ContributionRewardExt",
41+
"address": "0x54b27c2adC7Cc8C2BB1a2F2CE3920E755d03ab2e",
42+
"arcVersion": "0.0.1-rc.43"
43+
},
44+
{
45+
"name": "Competition",
46+
"address": "0x5446f6d6B40Dbb2a7AFC135B974ec693Bf43D29e",
47+
"arcVersion": "0.0.1-rc.43"
48+
},
49+
{
50+
"name": "GenericSchemeMultiCall",
51+
"address": "0xbe40c36fA171c06D4eD39179Bd2Df8d839d1830a",
52+
"arcVersion": "0.0.1-rc.51"
53+
},
54+
{
55+
"name": "ActionMock",
56+
"address": "0x0944765A460b050E888782f9CFDcb13fB07428Ea",
57+
"arcVersion": "0.0.1-rc.55"
58+
},
59+
{
60+
"name": "DxDaoSchemeConstraints",
61+
"address": "0xe45eFAb753086BA36645f1850dbF535477E0f1e0",
62+
"arcVersion": "0.0.1-rc.51"
63+
}
64+
],
65+
"arcVersion": "0.0.1-rc.55"
66+
}

‎daos/rinkeby/dummydao.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
"alias": "GenericSchemeMultiCall",
2323
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
2424
"arcVersion": "0.0.1-rc.47"
25+
},
26+
{
27+
"name": "ContinuousLocking4Reputation",
28+
"alias": "ContinuousLocking4Reputation",
29+
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
30+
"arcVersion": "0.0.1-rc.55"
2531
}
2632
],
2733
"StandAloneContracts": [
@@ -57,4 +63,4 @@
5763
}
5864
],
5965
"arcVersion": "0.0.1-rc.47"
60-
}
66+
}

‎daos/sokol/dummydao.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
"alias": "GenericSchemeMultiCall",
2323
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
2424
"arcVersion": "0.0.1-rc.47"
25+
},
26+
{
27+
"name": "ContinuousLocking4Reputation",
28+
"alias": "ContinuousLocking4Reputation",
29+
"address": "0xa0514D0987b539498d07DBB8D6C75d4cA33Adc5f",
30+
"arcVersion": "0.0.1-rc.55"
2531
}
2632
],
2733
"StandAloneContracts": [
@@ -57,4 +63,4 @@
5763
}
5864
],
5965
"arcVersion": "0.0.1-rc.47"
60-
}
66+
}

‎docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
ipfs: 'ipfs:5001'
1919
ethereum: 'private:http://ganache:8545'
2020
GRAPH_IPFS_TIMEOUT: '2'
21-
GRAPH_MAX_IPFS_FILE_BYTES: '500000'
21+
GRAPH_MAX_IPFS_FILE_BYTES: '600000'
2222
GRAPH_GRAPHQL_MAX_FIRST: '1000'
2323
ipfs:
2424
image: 'ipfs/go-ipfs:v0.4.23'
@@ -31,6 +31,6 @@ services:
3131
environment:
3232
POSTGRES_PASSWORD: letmein
3333
ganache:
34-
image: 'daostack/migration:0.0.1-rc.53-v0'
34+
image: 'daostack/migration:0.0.1-rc.55-v0'
3535
ports:
3636
- '8545:8545'

‎ops/generate-daos-subgraph.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { migrationFileLocation: defaultMigrationFileLocation, network, startBlock
44
const { subgraphLocation: defaultSubgraphLocation } = require('./graph-cli')
55
const path = require("path");
66
const currentDir = path.resolve(`${__dirname}`)
7-
const supportedSchemes = ['ContributionRewardExt', 'GenericScheme', 'GenericSchemeMultiCall']
7+
const supportedSchemes = ['ContinuousLocking4Reputation', 'ContributionRewardExt', 'GenericScheme', 'GenericSchemeMultiCall']
88
const supportedStandAloneContracts = ['Competition', 'DxDaoSchemeConstraints']
99
let ids = [];
1010

@@ -45,6 +45,11 @@ function daoYaml(contract, contractAddress, arcVersion) {
4545
file: path.resolve(`./abis/0.0.1-rc.33/UGenericScheme.json`)
4646
};
4747
}
48+
if ((_arcVersion < 24) && (contractName === "ContinuousLocking4Reputation")) {
49+
return {name: contractName,
50+
file: path.resolve(`./abis/0.0.1-rc.24/ContinuousLocking4Reputation.json`)
51+
};
52+
}
4853
if ((_arcVersion < 24) && (contractName === "UGenericScheme")) {
4954
return {name: contractName,
5055
file: path.resolve(`./abis/${arcVersion}/GenericScheme.json`)

‎ops/generate-subgraph.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ function combineFragments(fragments, isTemplate, addresses, missingAddresses) {
9393
file: `${__dirname}/../abis/${version}/GenericScheme.json`
9494
};
9595
}
96+
if ((versionNum < 24) && (contractName === "ContinuousLocking4Reputation")) {
97+
return {
98+
name: contractName,
99+
file: `${__dirname}/../abis/0.0.1-rc.24/ContinuousLocking4Reputation.json`
100+
};
101+
}
96102

97103
if ((versionNum < 36) && (contractName === "ContributionRewardExt")) {
98104
return {

0 commit comments

Comments
 (0)