chore(TPR-3): Lock compiler version #62
Merged
Conversation
This file contains 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
nachomazzara
approved these changes
Mar 22, 2022
fzavalia
changed the title
nachomazzara
added a commit
that referenced
this pull request
Apr 19, 2022
* wip: buy slots with oracle * feat: Rename ChainlinkRateProvider and get returned decimals from aggregator interface * feat: Rename IRateProvider and update final price calculation * feat: Update calculation (all mutiplications first) * refactor: Rename rate provider to oracle * feat: Add chainlink oracle tests * chore: Add constructor comment to chainlink oracle * chore: Move summy aggregator to chainlink folder * feat: Add oracle and feed to tests as well as set oracle test * feat: Add setItemSlotPrice test * feat: Add test for successfuly buying item * feat: Test buy slots with meta trx * feat: Add more buy item slots tests * feat: Add tests for add item slots * feat: Make all tests pass * feat: Remove unused variables + fix test * chore: Remove tiers * chore: Remove only from test * refactor: Add slots to buy and price of slots variables * fix: Remove only * chore: Recover verifyContract script * chore: Add task to verify * feat: Rename add slots event * chore: Add natspec to aggregator * chore: Add natspec to dummy aggregator * fix: Remove invalid character from natspec * chore: Only keep required aggregator functions * chore: Rename to dataFeed * feat: Make a staticcall to oracle getrate to avoid security issues * chore: Add comment to invalid oracle * feat: Also revert when result is 0 * chore: Update itemSlotPrice comment Co-authored-by: Ignacio Mazzara <[email protected]> * chore: Fix typos * feat: Add different tests to check PRICE_HIGHER_THAN_MAX_PRICE * chore: Move to variables * chore: oneEther is made with toWei util * feat: Update deploy third party script * feat: Update PRICE_HIGHER_THAN_MAX_PRICE validation test * chore: Remove magic function * feat: Add tests to check max price is not consumed completely if price is lower * feat: Add oracle to rarities + tests constructor + setOracle * chore: Add comment to rarities constuctir * chore: Add RaritiesWithOracle * chore: Restore old rarities * feat: Return updated price from getRarityByName * fix: Make all tests pass * chore: Restore old Raritie * feat: Update comments * feat: Add staticcall to rarities contract when getting the rate from the oracle * chore: Rename tests * feat: Create and Update require deploy scripts (#50) * chore: Update natspec * feat: Deploy chainlink oracle script * feat: Deploy dummy oracle script * chore: Remove verify from deploy third party script * chore: Rename deploy script * chore: Update chainlink oracle deploy script matic data feed address * chore: FIx comment * feat: Curate with merkle (#52) * wip: curate with merkle * chore: Test and Polish `curate-with-merkle` branch (#49) * feat: Make contract compile + update ecrecover usage * feat: Remove root from thir party review param * feat: Update function name * feat: Test review with root flow that does not call consume * chore: Test logs and new state * chore: Remove root from consume * chore: Add thir party test helpers * chore: Add commented test expecting future fix * chore: Add set rules test for rules and values length * feat: Add get rule value function * chore: Add more tests for set rule function * refactor: Move third party variable out of loop (some gas saved) * chore: Remove logger * fix: Hash string when creating message hash * chore: Add more tests for review with merkle * feat: Add salt as parameter * feat: Make external consumeSlots function and allow multiple consumeSlotsParams * chore: Add return annotation * chore: Use util to generate dummyBytes32 * chore: Some test updates * chore: _consumeSlots receibes a storage thirdparty * chore: Don't provide thirdParty as argument * chore: Revert when qty is 0 * chore: Add EIP721 test for review tp with root * chore: Test EIP721 on consumeSlots * chore: Add EIP721 test for setRules * chore: Test invalid root * chore: Move checkthirdparty outside of _consumeSlots * chore: Add test to check committee member Co-authored-by: Ignacio Mazzara <[email protected]> * chore: Remane aggregator chainlink interface to DataFeed (#53) * chore: Rename deploy script * chore: Update initialize test with a different owner (#54) * chore: Update deploy scripts (#55) * feat: Remove addItemSlots in favor of adding slots on add/update third parties functions (#56) * feat: itemsCount returns consumedSlots instead * chore: Add expect with itemsCount * feat: Remove addItemSlots and allow adding slots when adding or updating third parties * chore: Rename event parameter * chore: Optimize consume slots (#57) * feat: Make TPR contract upgradeable (#58) * feat: Change constructor with initialize function * chore: Use proxy on TPR tests * feat: Deploy TPR script deploy a proxy * chore: Trigger CI * chore: Update node version in CI * chore: Update ignores to not ignore unknown mumbai deployment file * chore: Add Dummy TPR Upgrade to test proxy upgrades * chore: Add deploy upgrade script * chore: Format * chore: Add test to check contract upgrade * chore: Add test to check failure when upgrader is not the owner * chore: Test upgrading the contract by calling the proxy admin directly instead of the plugin * chore: Remove new dependency lib + Use ProxyAdmin ABI directly * chore: Rename tests * chore: Add more revert tests for Proxy and Transparent * chore: Add tests for when the correct user call transparent of proxy admin contracts * chore: Don't use upgrade plugin as default for tests (#60) * chore: Use contracts from upgrades plugin * chore: Update tests to deploy proxies manually instead of rellying on the plugin * chore: Remove only * chore(TPR-2): Fix typo in TPR (#61) * chore(TPR-3): Lock compiler version (#62) * feat: Add _messageHash to ItemSlotsConsumed event (#63) * chore: Add message hash to event * feat: Test message hash * chore: Update deployment tracking config * chore: Update deploy file * chore: Move messageHash order * chore: Rename caller to sender (#64) * chore: Rename caller in events to sender * chore: Change CALLER to SENDER in errors * chore: Update dummy tpr * chore: Add new contracts to buildFull * chore: Update deployment track file (#65) * feat: Remove legacy items functions (#66) * feat: Add ThirdPartyRegistryV2 without add/upgrade items * chore: Delete OZ file between TPR tests * feat: deploy to mainnet * feat: deploy oracle with rarities + priv key at config Co-authored-by: Ignacio Mazzara <[email protected]>
nachomazzara
added a commit
that referenced
this pull request
Apr 19, 2022
* wip: registries * feat: bridge doc * feat: registry & tier contract * feat: tiers tests * wip: third party registry test * wip: tests * wip: test items * wip: test add items * feat: test update items * wip: test review items * feat: unit tets * fix: tests * feat: add end2end tests * chore: remove commented test * feat: add third party agregator * feat: add deploy scripts * chore: remove only * fix: CEI * feat: New registry version (#51) * wip: buy slots with oracle * feat: Rename ChainlinkRateProvider and get returned decimals from aggregator interface * feat: Rename IRateProvider and update final price calculation * feat: Update calculation (all mutiplications first) * refactor: Rename rate provider to oracle * feat: Add chainlink oracle tests * chore: Add constructor comment to chainlink oracle * chore: Move summy aggregator to chainlink folder * feat: Add oracle and feed to tests as well as set oracle test * feat: Add setItemSlotPrice test * feat: Add test for successfuly buying item * feat: Test buy slots with meta trx * feat: Add more buy item slots tests * feat: Add tests for add item slots * feat: Make all tests pass * feat: Remove unused variables + fix test * chore: Remove tiers * chore: Remove only from test * refactor: Add slots to buy and price of slots variables * fix: Remove only * chore: Recover verifyContract script * chore: Add task to verify * feat: Rename add slots event * chore: Add natspec to aggregator * chore: Add natspec to dummy aggregator * fix: Remove invalid character from natspec * chore: Only keep required aggregator functions * chore: Rename to dataFeed * feat: Make a staticcall to oracle getrate to avoid security issues * chore: Add comment to invalid oracle * feat: Also revert when result is 0 * chore: Update itemSlotPrice comment Co-authored-by: Ignacio Mazzara <[email protected]> * chore: Fix typos * feat: Add different tests to check PRICE_HIGHER_THAN_MAX_PRICE * chore: Move to variables * chore: oneEther is made with toWei util * feat: Update deploy third party script * feat: Update PRICE_HIGHER_THAN_MAX_PRICE validation test * chore: Remove magic function * feat: Add tests to check max price is not consumed completely if price is lower * feat: Add oracle to rarities + tests constructor + setOracle * chore: Add comment to rarities constuctir * chore: Add RaritiesWithOracle * chore: Restore old rarities * feat: Return updated price from getRarityByName * fix: Make all tests pass * chore: Restore old Raritie * feat: Update comments * feat: Add staticcall to rarities contract when getting the rate from the oracle * chore: Rename tests * feat: Create and Update require deploy scripts (#50) * chore: Update natspec * feat: Deploy chainlink oracle script * feat: Deploy dummy oracle script * chore: Remove verify from deploy third party script * chore: Rename deploy script * chore: Update chainlink oracle deploy script matic data feed address * chore: FIx comment * feat: Curate with merkle (#52) * wip: curate with merkle * chore: Test and Polish `curate-with-merkle` branch (#49) * feat: Make contract compile + update ecrecover usage * feat: Remove root from thir party review param * feat: Update function name * feat: Test review with root flow that does not call consume * chore: Test logs and new state * chore: Remove root from consume * chore: Add thir party test helpers * chore: Add commented test expecting future fix * chore: Add set rules test for rules and values length * feat: Add get rule value function * chore: Add more tests for set rule function * refactor: Move third party variable out of loop (some gas saved) * chore: Remove logger * fix: Hash string when creating message hash * chore: Add more tests for review with merkle * feat: Add salt as parameter * feat: Make external consumeSlots function and allow multiple consumeSlotsParams * chore: Add return annotation * chore: Use util to generate dummyBytes32 * chore: Some test updates * chore: _consumeSlots receibes a storage thirdparty * chore: Don't provide thirdParty as argument * chore: Revert when qty is 0 * chore: Add EIP721 test for review tp with root * chore: Test EIP721 on consumeSlots * chore: Add EIP721 test for setRules * chore: Test invalid root * chore: Move checkthirdparty outside of _consumeSlots * chore: Add test to check committee member Co-authored-by: Ignacio Mazzara <[email protected]> * chore: Remane aggregator chainlink interface to DataFeed (#53) * chore: Rename deploy script * chore: Update initialize test with a different owner (#54) * chore: Update deploy scripts (#55) * feat: Remove addItemSlots in favor of adding slots on add/update third parties functions (#56) * feat: itemsCount returns consumedSlots instead * chore: Add expect with itemsCount * feat: Remove addItemSlots and allow adding slots when adding or updating third parties * chore: Rename event parameter * chore: Optimize consume slots (#57) * feat: Make TPR contract upgradeable (#58) * feat: Change constructor with initialize function * chore: Use proxy on TPR tests * feat: Deploy TPR script deploy a proxy * chore: Trigger CI * chore: Update node version in CI * chore: Update ignores to not ignore unknown mumbai deployment file * chore: Add Dummy TPR Upgrade to test proxy upgrades * chore: Add deploy upgrade script * chore: Format * chore: Add test to check contract upgrade * chore: Add test to check failure when upgrader is not the owner * chore: Test upgrading the contract by calling the proxy admin directly instead of the plugin * chore: Remove new dependency lib + Use ProxyAdmin ABI directly * chore: Rename tests * chore: Add more revert tests for Proxy and Transparent * chore: Add tests for when the correct user call transparent of proxy admin contracts * chore: Don't use upgrade plugin as default for tests (#60) * chore: Use contracts from upgrades plugin * chore: Update tests to deploy proxies manually instead of rellying on the plugin * chore: Remove only * chore(TPR-2): Fix typo in TPR (#61) * chore(TPR-3): Lock compiler version (#62) * feat: Add _messageHash to ItemSlotsConsumed event (#63) * chore: Add message hash to event * feat: Test message hash * chore: Update deployment tracking config * chore: Update deploy file * chore: Move messageHash order * chore: Rename caller to sender (#64) * chore: Rename caller in events to sender * chore: Change CALLER to SENDER in errors * chore: Update dummy tpr * chore: Add new contracts to buildFull * chore: Update deployment track file (#65) * feat: Remove legacy items functions (#66) * feat: Add ThirdPartyRegistryV2 without add/upgrade items * chore: Delete OZ file between TPR tests * feat: deploy to mainnet * feat: deploy oracle with rarities + priv key at config Co-authored-by: Ignacio Mazzara <[email protected]> Co-authored-by: Nando <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix compiler version to
0.7.6(Not fixing on0.7.3because some dependencies have0.7.6as minimum)