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

ripe v3 dao front end #708

Closed
wants to merge 242 commits into from
Closed

ripe v3 dao front end #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
42fbe07
Revert "remove POC webapp code from this branch"
davidbrai Jan 29, 2023
2fc4c79
POC frontend code for update proposal
davidbrai Jan 30, 2023
a96e530
POC frontend code for objection period
davidbrai Jan 31, 2023
0feb291
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Feb 8, 2023
ba064ea
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Feb 8, 2023
af5618c
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Feb 10, 2023
e8d0b4e
add newlines
davidbrai Feb 10, 2023
9c24379
poc frontend code for objection period done
davidbrai Feb 10, 2023
3f99ebd
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Feb 13, 2023
6ea55bb
use different typehash for updateProposalBySigs
davidbrai Feb 13, 2023
189a92d
initial scaffolding for candidates tab on proposal page
ripe0x Apr 11, 2023
5a9fce7
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Apr 12, 2023
1ac70e3
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Apr 12, 2023
1e857e3
fix build
davidbrai Apr 12, 2023
d65012c
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into ripe-…
ripe0x Apr 13, 2023
26102c4
add sidebar to candidates list
ripe0x Apr 14, 2023
983a74f
scaffold create-candidate page
ripe0x Apr 14, 2023
ca46ea8
sponsor module scaffolding
ripe0x Apr 15, 2023
9e29190
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Apr 16, 2023
7427ca7
move data contract abi to data folder
davidbrai Apr 16, 2023
5f7f348
add signatures backref to candidate object in subgraph
davidbrai Apr 16, 2023
b5ff46e
poc for creating proposal candidates via data contract
davidbrai Apr 16, 2023
9a58a3f
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Apr 16, 2023
5e02422
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai Apr 18, 2023
8051c27
frontend: signing candidate and broadcasting to data contract
davidbrai Apr 18, 2023
0f454f2
add support for non nouner to create candidate
davidbrai Apr 18, 2023
317130a
upgrade font awesome packages
ripe0x Apr 20, 2023
f64be76
add CandidateSignature type
ripe0x Apr 20, 2023
5c18cf0
static front-end elements for candidate sponsors
ripe0x Apr 20, 2023
dfc2be4
additional states for sponsors
ripe0x Apr 20, 2023
ad26f54
add version number to proposal header
ripe0x Apr 20, 2023
10b54bc
edit proposals and candidates
ripe0x Apr 20, 2023
685f96c
initial wip code for dao split
davidbrai Apr 24, 2023
d122d44
buildfix
davidbrai Apr 24, 2023
6e02668
add block number function to timeUtils
ripe0x Apr 24, 2023
387a768
styling version history components and page with dummy data
ripe0x Apr 24, 2023
3c878a4
vote signals with dummy data, styling and animations
ripe0x Apr 25, 2023
8e01faf
clean up styling on candidates cards and sidebar in tab
ripe0x Apr 25, 2023
8b74837
basic test for dao split
davidbrai Apr 26, 2023
2ea789a
move file
davidbrai Apr 26, 2023
c213349
dao split: improve tests and continue implementation
davidbrai Apr 27, 2023
1c7710c
dao split: change escrow to be singleton
davidbrai Apr 27, 2023
f7e32f9
dao split: minor refactor
davidbrai Apr 27, 2023
91443f2
dao split: added tests for a followup split
davidbrai Apr 27, 2023
35b32d8
dao split: minor
davidbrai Apr 27, 2023
90d050f
Merge branch 'verbs-dao-v3-frontend-poc' into ripe-v3-dao-front-end-v…
ripe0x Apr 27, 2023
95a6b60
add create candidate functions from poc
ripe0x Apr 28, 2023
9471e4b
dao split: proposalThreshold uses adjustedTotalSupply
davidbrai Apr 28, 2023
97ce913
dynamic quorum view functions look at adjusted total supply
davidbrai Apr 28, 2023
969c630
dao split: escrow saves immutable registry of who escrowed
davidbrai Apr 28, 2023
d586ceb
dao split: minor test improvement
davidbrai Apr 28, 2023
0e8c334
split: initial version of the new dao token
eladmallel May 1, 2023
ab4e574
split: new dao deployer WIP
eladmallel May 1, 2023
f009580
split: add timelockv2 to new dao deployer
eladmallel May 1, 2023
9948894
split: add dao v1 with uups modification
eladmallel May 1, 2023
2042af2
split: new token claim add recipient param
eladmallel May 2, 2023
ef96695
split: v1 new dao rename
eladmallel May 2, 2023
a13c717
split: add delayed governance
eladmallel May 2, 2023
fc3f955
split: set new dao contracts owner to treasury
eladmallel May 2, 2023
d60e237
split: add vanilla quit to new daos
eladmallel May 2, 2023
fe5a3f8
split: add a basic happy flow test
eladmallel May 2, 2023
900b92f
queries and parsing for candidates, versions, and signatures
ripe0x May 3, 2023
a58913f
candidates page elements
ripe0x May 3, 2023
9c6190d
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai May 3, 2023
8f73688
show sig canceled state
davidbrai May 3, 2023
0ad059b
proposer options on proposal page
ripe0x May 3, 2023
77a8183
Merge branch 'verbs-dao-v3-frontend-poc' into ripe-v3-dao-front-end-v…
ripe0x May 3, 2023
484d02a
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai May 4, 2023
ea500d5
fetch updatePeriodEndBlock from subgraph
davidbrai May 4, 2023
2402084
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai May 4, 2023
7350c88
add feedback form
ripe0x May 4, 2023
11a2c35
Merge branch 'verbs-dao-v3-frontend-poc' into ripe-v3-dao-front-end-v…
ripe0x May 4, 2023
07b4e8b
add updatable status to front end
ripe0x May 4, 2023
cc8b595
proposal header version no
ripe0x May 5, 2023
e2e037e
add locale setting to docker-compose.yml
ripe0x May 5, 2023
568e6f2
make ProposalContent component props more specific and update pages t…
ripe0x May 5, 2023
b4cf9e8
proposal version tabs pulling in correct versions with permalinks for…
ripe0x May 5, 2023
526243f
rename split -> fork
davidbrai May 8, 2023
f6384a1
fix test
davidbrai May 8, 2023
829513f
Merge branch 'verbs-dao-v3-contract-size-libraries-design' into verbs…
davidbrai May 8, 2023
b42b0eb
proposal version diffs
ripe0x May 8, 2023
b566e34
get proposal feedback data in and add version-specific guides, object…
ripe0x May 9, 2023
4eab44f
tests: add dao v3 proposal state tests
davidbrai May 9, 2023
70cb649
block proposal execution during forking period
davidbrai May 9, 2023
cd1af64
formatting
davidbrai May 10, 2023
2bfa73e
make forkPeriod and forkThreshold dao configurable
davidbrai May 10, 2023
219ad6a
fix test
davidbrai May 10, 2023
47fd444
setForkEscrow is onlyAdmin
davidbrai May 10, 2023
1009519
fork token: prevent nounders value set to address zero
eladmallel May 10, 2023
ad6058e
fork period upper bound is 14 days
davidbrai May 11, 2023
44c567a
extract test utils for dao v3 to reduce depedency graph for faster co…
davidbrai May 11, 2023
b9caa87
test refactor to reduce dependencies
davidbrai May 11, 2023
4265145
refactor escrow contract
davidbrai May 11, 2023
0200aa7
rename functions
davidbrai May 11, 2023
42f4ae6
fork: dao withdraw has a to param and allowed only by the dao
davidbrai May 11, 2023
029bdbb
rename function
davidbrai May 11, 2023
96dae6c
add proposalIds and reason params to escrowToFork
davidbrai May 11, 2023
a428cdb
add missing assertion
eladmallel May 11, 2023
594dba1
cleanup
davidbrai May 11, 2023
1400208
joinFork sends tokens to escrow
davidbrai May 11, 2023
5d8ad6d
fork: remove founder reward from token
eladmallel May 12, 2023
e979b10
work in progress on proposeOnTimelockV1
davidbrai May 15, 2023
a6c8323
test: add comments to make the fork happy flow easier to read
eladmallel May 15, 2023
3ec370e
fork: add reentrance protection to the quit function
eladmallel May 15, 2023
cb714ef
fork: apply the V2 cancel function bug fix
eladmallel May 15, 2023
5d4ebe0
fork: fix the votingDelay editing bug same as in V2
eladmallel May 15, 2023
ba128c9
fork: original DAO can claim for Nouners only during the forking period
eladmallel May 15, 2023
254ada3
add test for using executeOnTimelockV1
davidbrai May 16, 2023
41e432e
add tests for proposeOnTimelockV1
davidbrai May 16, 2023
018b8f7
add test that timelockv2 is upgradeable by the dao
davidbrai May 16, 2023
c7acd25
rename test
davidbrai May 16, 2023
13cc0fc
Merge pull request #707 from nounsDAO/verbs-dao-v3-proposeOnTimelockV1
davidbrai May 16, 2023
3de345f
attempt to buildfix
davidbrai May 16, 2023
b25c553
test: add fork DAO to v1v2 shared tests
eladmallel May 16, 2023
6c6ca18
fork: change quit to send ETH as the last action
eladmallel May 16, 2023
69c814a
fork: test all contracts are upgradable
eladmallel May 16, 2023
849deeb
natspec: minor fix
eladmallel May 16, 2023
e851975
make sure dao is upgradeable post v3 upgrade
davidbrai May 17, 2023
3b79ce4
timelockv2: increase grade period and add docs
davidbrai May 17, 2023
8add5b2
improve test for upgrade to dao v3
davidbrai May 17, 2023
052f9ea
fork: test delayed governance
eladmallel May 17, 2023
79b1a4e
fork: test the quit function
eladmallel May 17, 2023
9b4428a
fix typo
eladmallel May 17, 2023
242accd
imports cleanup
eladmallel May 17, 2023
1e26fb1
fork: test usage of adjusted total supply
eladmallel May 17, 2023
6478ca0
fork: add token tests
eladmallel May 17, 2023
f46f0dc
fork: test vetoer is address zero
eladmallel May 17, 2023
d568e13
add ProposeCreateOnTimelockV1 event
davidbrai May 18, 2023
45e36bc
add assertion to upgrade to v3 test
davidbrai May 18, 2023
795bd17
add events to NounsDAOV3Fork
davidbrai May 18, 2023
35ee12f
add events to NounsDAOExecutorV2
davidbrai May 18, 2023
6d4fce7
update gas snapshot
eladmallel May 18, 2023
33e83f1
minor storage reads savings
eladmallel May 18, 2023
5370677
rename timelockv2 send funds functions per spec
eladmallel May 18, 2023
99afe18
v3: minor re-order of storage variables
eladmallel May 18, 2023
1e9f7d6
gas snapshot update
eladmallel May 18, 2023
f85f122
minor gas savings
eladmallel May 18, 2023
d6bd5be
gas: read adjustedTotalSupply less times
eladmallel May 18, 2023
49ce0d4
gas: more savings in propose
eladmallel May 18, 2023
8087821
clarify how objectionPeriod gets applied to proposal page
ripe0x May 18, 2023
0b5d2e9
cosmetic: moved some functions around
eladmallel May 18, 2023
208680d
gas: save gas in castVote, removed a proposal.id read
eladmallel May 18, 2023
c8083d4
gas: add objection period votes to snapshot
eladmallel May 18, 2023
b4249c3
gas: minor optimization
eladmallel May 18, 2023
8c298f9
gas: castVote minor reduction
eladmallel May 18, 2023
d24599d
gas: save objection period voting gas
eladmallel May 18, 2023
3f9dbbe
gas: castVote reduction
eladmallel May 18, 2023
f0b42c7
make local node deployment work
davidbrai May 19, 2023
a2bf9f4
Merge remote-tracking branch 'refs/remotes/origin/verbs-dao-v3-dao-sp…
davidbrai May 19, 2023
799b35b
gas: minor optimization
davidbrai May 19, 2023
c711764
gas: some maybe risky gas optimizations, require testing
davidbrai May 19, 2023
c83baff
buildfix
davidbrai May 19, 2023
5e1d525
gas: optimize castVote
davidbrai May 19, 2023
11d9d2e
data: change proxy to UUPS
eladmallel May 19, 2023
fe4906b
subgraph: update local data proxy address
eladmallel May 19, 2023
9632bcf
fork: add tests
eladmallel May 19, 2023
56f82ec
fork: improve token natspec
eladmallel May 19, 2023
ab53d13
fork: improve auction house natspecs
eladmallel May 19, 2023
bf5b90b
natspec
eladmallel May 19, 2023
f4f310e
rename: fork token interface
eladmallel May 19, 2023
010d238
fork: token inherits from OZ base contracts
eladmallel May 19, 2023
2819716
clean up ux on add and cancel sigs
ripe0x May 21, 2023
f09408a
better styling of diffs between proposal versions, move transactions …
ripe0x May 21, 2023
dc56698
clean up candidate create and view layouts
ripe0x May 21, 2023
0b6b1b2
better parsing of proposal candidate data, resolve issue with candida…
ripe0x May 21, 2023
006c9ce
transaction link in candidate header
ripe0x May 21, 2023
9cecba9
tighten up consistencies between proposal and candidate pages and his…
ripe0x May 22, 2023
94659df
pull in noun id images on candidate cards
ripe0x May 22, 2023
972c238
prettier formatter
ripe0x May 22, 2023
e250f15
remove unused code
ripe0x May 22, 2023
926b2b5
small style changes, code clean up
ripe0x May 22, 2023
564091b
better handling of proposeBySigs ux
ripe0x May 22, 2023
53a1daf
bugfix: reorg proposal storage order
davidbrai May 22, 2023
a098e41
Merge branch 'verbs-dao-v3-dao-split' into verbs-dao-v3-gas-optimizat…
davidbrai May 22, 2023
df5355a
Merge branch 'verbs-dao-v3-gas-optimizations' into verbs-dao-v3-dao-s…
davidbrai May 22, 2023
3942b73
fork: pass escrow as param instead of constructor
davidbrai May 22, 2023
c3bd6a1
initial version of dao v3 deploy scripts
davidbrai May 22, 2023
2454b01
remove unused vars to resolve ts errors
ripe0x May 22, 2023
ec3376e
fork: fix the delegateBySig known issue for fork tokens
eladmallel May 22, 2023
1b000a7
fork: rename token base contract for readability
eladmallel May 22, 2023
6039704
fork: update DAO logic modification docs
eladmallel May 22, 2023
7ba0293
remove unused interface
eladmallel May 22, 2023
06430e2
fork: add modification docs to ERC721Checkpointable
eladmallel May 22, 2023
1d87c0d
fork: add modification docs to auctionhouse
eladmallel May 22, 2023
e1d2799
fork: revent on fork creation if funds transfer fails
eladmallel May 22, 2023
f416ce3
remove redundant todo
eladmallel May 22, 2023
dcd3259
dao v3 deploy script - almost done
davidbrai May 23, 2023
51c4a2d
refactor: markOwner -> onERC721Received
davidbrai May 23, 2023
d6588b3
cleanup onlyAdmin
davidbrai May 23, 2023
2beadd1
cleanup
davidbrai May 23, 2023
39a5414
change _setVoteSnapshotBlockSwitchProposalId to set to the next propo…
davidbrai May 23, 2023
fa1809c
add natspec
davidbrai May 23, 2023
940eafa
rename a test function
eladmallel May 23, 2023
eb34b5b
cleanup
davidbrai May 23, 2023
64e966b
cleanup
davidbrai May 23, 2023
1d3592e
natspec
davidbrai May 24, 2023
824b514
copy missing DAO event declarations from libs
davidbrai May 24, 2023
226555e
natspec
davidbrai May 24, 2023
7b180a0
cleanup changes from objection period POC in dao v2
davidbrai May 24, 2023
cf3f3fc
natspec
davidbrai May 24, 2023
a778331
natspec
davidbrai May 24, 2023
7a209f4
add executeOnTimelockV1 to proposalsV3 getter
davidbrai May 24, 2023
82f0a66
natspec
davidbrai May 24, 2023
068c664
buildfix
davidbrai May 24, 2023
60c6b7c
natspec
davidbrai May 24, 2023
2e9652c
natspec
davidbrai May 24, 2023
c952573
natspec fix
davidbrai May 24, 2023
70ecd0d
natspec
davidbrai May 24, 2023
8a8f4ad
fork: remove all vetoer code from fork daos
eladmallel May 24, 2023
8070bd2
edit proposals without error
ripe0x May 24, 2023
50d8f17
fix dependency errors
ripe0x May 24, 2023
0aa35fb
v3 upgrade: change auction house owner
davidbrai May 25, 2023
70c2183
natspec
davidbrai May 25, 2023
64817d1
move veto function to proposals lib
davidbrai May 25, 2023
f638b12
natspec
davidbrai May 25, 2023
9a444eb
add docs
davidbrai May 25, 2023
fc4b552
add upper bounds to objection and updatable periods
eladmallel May 25, 2023
f9ce177
test cleanup
eladmallel May 25, 2023
3c40247
add forkId to fork related events
eladmallel May 25, 2023
88cf78d
subgraph: clean build warnings
eladmallel May 25, 2023
fbe5d39
fork: add reason and proposalIds to joinFork
eladmallel May 25, 2023
7e6cbb6
subgraph: support fork events WIP
eladmallel May 25, 2023
61384cd
subgraph: fix schema missing derivedFrom
eladmallel May 25, 2023
52d4540
add tests for cancel proposal
davidbrai May 26, 2023
ce9d4af
add test of fork scenario with a mainnet fork test
davidbrai May 26, 2023
b37e26c
subgraph: fix fork code
eladmallel May 26, 2023
b6865e7
subgraph: add owner to nouns in fork
eladmallel May 26, 2023
11b4297
subgraph: add forkID BigInt
eladmallel May 26, 2023
8477de0
fork: index forkID in events
eladmallel May 26, 2023
3ddaa6e
Merge branch 'verbs-dao-v3-dao-split' into ripe-v3-dao-front-end
eladmallel May 26, 2023
efd3e3f
subgraph: fix broken test
eladmallel May 26, 2023
6bbc822
Merge branch 'verbs-dao-v3-dao-split' into ripe-v3-dao-front-end
eladmallel May 26, 2023
a15b69c
add NounsDAOExecutorV2Test for testing purposes
davidbrai May 29, 2023
974ee9d
add hardhat scripts for dao v3 short times
eladmallel May 29, 2023
9232207
add deploy scripts for goerli
davidbrai May 29, 2023
405a10b
make dynamicQuorum lib not be an external depedency of the admin lib
davidbrai May 29, 2023
47775a7
data: add goerli deploy script and latest deploy details json
eladmallel May 29, 2023
cfe90b5
Merge branch 'verbs-dao-v3-dao-split' into ripe-v3-dao-front-end
eladmallel May 29, 2023
d89ed87
update goerli addresses
eladmallel May 29, 2023
80450bf
subgraph: update goerli addresses
eladmallel May 29, 2023
3fbc155
webapp: use better tokenbuyer on goerli
eladmallel May 29, 2023
638c5b9
add signers to proposal subgraph call, display cancel function on pro…
ripe0x May 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/contracts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
- name: Run Forge tests
run: |
cd packages/nouns-contracts
forge test -vvv --ffi
forge test -vvv --ffi --nmc 'ForkMainnetTest'
15 changes: 11 additions & 4 deletions packages/nouns-contracts/.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
NounsDAOLogic_GasSnapshot_V2:test_propose_longDescription() (gas: 528689)
NounsDAOLogic_GasSnapshot_V2:test_propose_shortDescription() (gas: 398310)
NounsDAOLogic_GasSnapshot_V3:test_propose_longDescription() (gas: 556248)
NounsDAOLogic_GasSnapshot_V3:test_propose_shortDescription() (gas: 425860)
NounsDAOLogic_GasSnapshot_V2_propose:test_propose_longDescription() (gas: 528733)
NounsDAOLogic_GasSnapshot_V2_propose:test_propose_shortDescription() (gas: 398388)
NounsDAOLogic_GasSnapshot_V2_vote:test_castVoteWithReason() (gas: 83474)
NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_against() (gas: 82886)
NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_lastMinuteFor() (gas: 83459)
NounsDAOLogic_GasSnapshot_V3_propose:test_propose_longDescription() (gas: 538195)
NounsDAOLogic_GasSnapshot_V3_propose:test_propose_shortDescription() (gas: 404029)
NounsDAOLogic_GasSnapshot_V3_vote:test_castVoteWithReason() (gas: 89809)
NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_against() (gas: 88733)
NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_lastMinuteFor() (gas: 112249)
NounsDAOLogic_GasSnapshot_V3_voteDuringObjectionPeriod:test_castVote_duringObjectionPeriod_against() (gas: 88656)
Loading