Merged
Conversation
Joeysantoro
commented
Oct 23, 2021
Joeysantoro
commented
Oct 23, 2021
Joeysantoro
commented
Oct 23, 2021
xklob
reviewed
Oct 24, 2021
proposals/description/fip_34.json
Outdated
| @@ -8,12 +8,40 @@ | |||
| "arguments": ["{optimisticMinter}"], | |||
| "description": "Grant Minter optimistic Minter" | |||
Contributor
There was a problem hiding this comment.
since we're dealing with multiple minter roles here we should be a bit more specific. would change this to "grant fei-minter role to the optimistic-minter contract"
Joeysantoro
commented
Oct 24, 2021
| expect(await timelock.admin()).to.be.equal(feiDAO.address); | ||
| expect(await feiDAOTimelock.admin()).to.be.equal(feiDAO.address); | ||
| expect(await feiDAO.timelock()).to.be.equal(feiDAOTimelock.address); | ||
| expect(await tribe.minter()).to.be.equal(feiDAOTimelock.address); |
Contributor
Author
There was a problem hiding this comment.
this is already tested by e2e suite but fine to leave for extra check
Joeysantoro
commented
Oct 24, 2021
Joeysantoro
commented
Oct 24, 2021
Joeysantoro
commented
Oct 24, 2021
test/integration/tests/fip_34.ts
Outdated
|
|
||
| // Queue FIP-34 (calldata generated by running the calldata npm script) | ||
| const calldata = | ||
| '0x7d5e81e2000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000000060000000000000000000000008d5ed43dca8c2f7dfb20cf7b53cc7e593635d7b90000000000000000000000008d5ed43dca8c2f7dfb20cf7b53cc7e593635d7b9000000000000000000000000956f47f50a910163d8bf957cf5846d573e7f87ca0000000000000000000000008d5ed43dca8c2f7dfb20cf7b53cc7e593635d7b9000000000000000000000000c7283b66eb1eb5fb86327f08e1b5816b0720212b0000000000000000000000000bef27feb58e857046d630b2c03dfb7bae5674940000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000024261707fa000000000000000000000000e66c4de480bd317054b5a3cf8e8689649d0728c9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024261707fa000000000000000000000000639572471f2f318464dc01066a56867130e45e2500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004440c10f19000000000000000000000000bc9c084a12678ef5b516561df902fdc426d9548300000000000000000000000000000000000000000052b7d2dcc80cd2e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024cfbd4885000000000000000000000000639572471f2f318464dc01066a56867130e45e25000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024fca3b5aa000000000000000000000000d51dba7a94e1adea403553a8235c302cebf41a3c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024a890c910000000000000000000000000d51dba7a94e1adea403553a8235c302cebf41a3c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002fa4649502d33343a204f7074696d6973746963204d696e7465720a53756d6d6172793a0a4772616e74206f7074696d697374696320617070726f76616c207468652072617465206c696d69746564206162696c69747920746f206d696e74204645492c20746f20636f6e74696e756520746f2066756e642044414f206f7065726174696f6e73206c696b65204649502d3133206c656e64696e67206465706c6f796d656e747320616e6420706f74656e7469616c6c79204c69717569646974792d61732d612d536572766963652e0a4164646974696f6e616c6c79206d696e7420616e20696e697469616c203130304d2046454920746f207468652074696d656c6f636b2e0a0a4d6f7469766174696f6e3a0a496e7374656164206f6620636f6e74696e75616c6c7920676f696e67206261636b20746f207468652044414f20746f2061736b20666f72206d6f72652066756e64696e672c204665692050726f746f636f6c2063616e206465706c6f79206120636f6e747261637420776869636820616c6c6f777320746865204f412074696d656c6f636b20746f206d696e742046454920706572696f646963616c6c792e0a54686973206d696e7465722077696c6c2068617665206120686172642072617465206c696d6974206f6e2074686520616d6f756e74206d696e7465642e205468657365206d696e74696e67732077696c6c207374696c6c206265207375626a65637420746f207468652034206461792074696d656c6f636b2c2062757420776f756c64206e6f74207265717569726520676f7665726e616e636520696e74657276656e74696f6e2e0a0a466f72756d2064697363757373696f6e3a2068747470733a2f2f74726962652e6665692e6d6f6e65792f742f6669702d33342d6665692d6d696e74696e672d666f722d6f7074696d69737469632d617070726f76616c2f33353635200a436f64653a2068747470733a2f2f6769746875622e636f6d2f6665692d70726f746f636f6c2f6665692d70726f746f636f6c2d636f72652f70756c6c2f3235390a000000000000'; |
Contributor
Author
There was a problem hiding this comment.
should generate calldata dynamically if possible
Joeysantoro
commented
Oct 24, 2021
test/integration/tests/fip_34.ts
Outdated
| doLogging && console.log(`ProposalID: ${parsedLog}`); | ||
|
|
||
| // Send eth to voters | ||
| const vitalikAddress = '0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B'; |
Contributor
Author
There was a problem hiding this comment.
prayers up to big v
xklob
previously approved these changes
Oct 25, 2021
check proposal cleanup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In order the transfer the TRIBE minter role to the new timelock, we need to roll back to the previous timelock and queue the proposal from it, including a new proposal to transfer the TRIBE minter role.