Audit PR against master with no fees #39
Draft
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
Fix `processed` mapping to protect incorrect proof
commit a940d49 Author: Tom Wade <[email protected]> Date: Fri Sep 30 11:01:35 2022 +0100 Update test constructors commit cbc1ecf Author: Tom Wade <[email protected]> Date: Fri Sep 23 15:48:01 2022 +0100 Use a mapping for zap contracts commit edd0dcf Author: Tom Wade <[email protected]> Date: Fri Sep 23 15:47:53 2022 +0100 Make swap target immutable on deployment commit 109d649 Merge: 456c6d8 fdf7a6b Author: Tom Wade <[email protected]> Date: Fri Sep 23 15:11:44 2022 +0100 Merge branch '0x' into feature/sc-529/yield-staking-zap commit fdf7a6b Author: Tom Wade <[email protected]> Date: Fri Sep 23 15:07:49 2022 +0100 Add tests for pausing logic commit deaa385 Author: Tom Wade <[email protected]> Date: Fri Sep 23 15:07:42 2022 +0100 Ensure address is payable commit 8a914d1 Author: Tom Wade <[email protected]> Date: Fri Sep 23 14:42:16 2022 +0100 Make swap target immutable commit 456c6d8 Author: Tom Wade <[email protected]> Date: Tue Sep 20 12:14:53 2022 +0100 Update to use minTokenIn commit 63e85f0 Author: Tom Wade <[email protected]> Date: Wed Sep 14 20:29:08 2022 +0100 Move modifier to external functions commit adda004 Author: Tom Wade <[email protected]> Date: Wed Sep 14 20:28:08 2022 +0100 Move paused check to modifier commit f5cfa48 Author: Tom Wade <[email protected]> Date: Wed Sep 14 11:25:31 2022 +0100 Fix typos commit b231305 Merge: 02d7752 f3c3398 Author: Tom Wade <[email protected]> Date: Wed Sep 14 11:23:32 2022 +0100 Merge branch '0x' into feature/sc-529/yield-staking-zap commit f3c3398 Author: Tom Wade <[email protected]> Date: Wed Sep 14 10:54:03 2022 +0100 Fix typos (onlyOnwer) commit d2c68b1 Author: Tom Wade <[email protected]> Date: Tue Sep 13 20:47:44 2022 +0100 Add payable commit 02d7752 Author: Tom Wade <[email protected]> Date: Tue Sep 13 20:47:04 2022 +0100 Updates commit 92069ad Merge: 79a837b 83e8e90 Author: Tom Wade <[email protected]> Date: Tue Sep 13 20:42:24 2022 +0100 Merge branch '0x' into feature/sc-529/yield-staking-zap # Conflicts: # contracts/solidity/NFTXInventoryStaking.sol commit 83e8e90 Merge: 71f1027 348ac5a Author: Tom Wade <[email protected]> Date: Tue Sep 13 20:10:55 2022 +0100 Merge branch 'master' into 0x # Conflicts: # contracts/solidity/NFTXMarketplace0xZap.sol # scripts/deploy-marketplace0x-zap.js commit 71f1027 Author: Tom Wade <[email protected]> Date: Tue Sep 13 20:09:13 2022 +0100 Add MANY fixes - Set swap target - Allow zap pausing - Set oanable - Set reentrancy guard - Remove passable swap target - Cry commit 79a837b Author: Tom Wade <[email protected]> Date: Tue Sep 13 19:56:05 2022 +0100 Staking updates commit 8352ba3 Author: Tom Wade <[email protected]> Date: Tue Sep 13 16:23:04 2022 +0100 Update to fix contract issues commit 18c63c3 Author: Tom Wade <[email protected]> Date: Tue Sep 13 13:38:14 2022 +0100 Add DustReturned event commit 348ac5a Author: Tom Wade <[email protected]> Date: Tue Sep 13 09:24:06 2022 +0100 Allow merkle eligibility expiration check in `init_bytes` rather than constructor (#30) commit d75d6e1 Author: Tom Wade <[email protected]> Date: Tue Sep 13 09:22:54 2022 +0100 Add 0x Marketplace Zap (#18) commit 0eee1f4 Merge: 81f65d8 3fa9d51 Author: Tom Wade <[email protected]> Date: Fri Sep 9 10:06:16 2022 +0100 Merge branch 'master' into 0x # Conflicts: # hardhat.config.js commit 81f65d8 Author: Tom Wade <[email protected]> Date: Fri Sep 9 10:03:10 2022 +0100 Remove unused imports commit d47c0c1 Author: Tom Wade <[email protected]> Date: Wed Sep 7 14:43:52 2022 +0100 Always transfer dust in ETH commit bd2b30a Author: Tom Wade <[email protected]> Date: Wed Sep 7 10:29:34 2022 +0100 Remove spender and check dust balance commit a15f749 Author: Tom Wade <[email protected]> Date: Wed Sep 7 10:12:16 2022 +0100 Add vault dust return commit f31ec58 Author: Tom Wade <[email protected]> Date: Wed Sep 7 10:10:38 2022 +0100 Update tests commit 6ace6d6 Author: Tom Wade <[email protected]> Date: Fri Sep 2 15:02:48 2022 +0100 Add test and deploy script commit 93be32b Author: Tom Wade <[email protected]> Date: Thu Sep 1 14:01:10 2022 +0100 Add Yield Staking Zap commit 6e267cd Author: anon <[email protected]> Date: Fri Aug 12 08:48:09 2022 +0100 completed todo documentation commit 3fa9d51 Author: Tom Wade <[email protected]> Date: Tue Aug 9 12:44:02 2022 +0100 Optimise ENS merkle flow (#29) commit 60143aa Author: Tom Wade <[email protected]> Date: Fri Aug 5 11:49:05 2022 +0100 Update merkle to allow as implementation (#28) commit 15789ae Merge: b27cf76 8dd9329 Author: Capsicle1 <[email protected]> Date: Tue Aug 2 16:38:31 2022 +0300 Merge pull request #27 from NFTX-project/feature/ens-eligibility Fix `processed` mapping to protect incorrect proof commit 8dd9329 Merge: d38aa48 b27cf76 Author: Tom Wade <[email protected]> Date: Tue Aug 2 14:34:13 2022 +0100 Merge branch 'master' into feature/ens-eligibility # Conflicts: # contracts/solidity/eligibility/NFTXMerkleEligibility.sol commit d38aa48 Author: Tom Wade <[email protected]> Date: Tue Aug 2 14:33:31 2022 +0100 Fix processing boolean commit 22b0f74 Author: Tom Wade <[email protected]> Date: Tue Aug 2 14:31:00 2022 +0100 Update config commit b27cf76 Author: Tom Wade <[email protected]> Date: Tue Aug 2 12:34:13 2022 +0100 Add Merkle eligibility logic for ENS vaults (#24) commit 2fe0ffe Author: Tom Wade <[email protected]> Date: Tue Aug 2 12:33:20 2022 +0100 Add multiple token processing and add test suite (#25) commit c170896 Author: Tom Wade <[email protected]> Date: Tue Aug 2 12:33:09 2022 +0100 Add expiry check to ENS Merkle Eligibility (#26) commit ea18acd Author: Tom Wade <[email protected]> Date: Tue Jul 26 09:59:41 2022 +0100 Update config commit 4d6369e Author: Tom Wade <[email protected]> Date: Tue Jul 26 09:54:33 2022 +0100 Streamline the code commit 8643ce1 Author: Tom Wade <[email protected]> Date: Tue Jul 26 08:16:46 2022 +0100 Add Merkle eligibility commit f38eb5e Author: Tom Wade <[email protected]> Date: Thu Jul 21 11:20:49 2022 +0100 Refactor BuyAndRedeem commit 48ef1a1 Merge: 0e9f492 a20b542 Author: Alex <[email protected]> Date: Wed Jul 20 18:59:38 2022 -0700 Merge pull request #22 from NFTX-project/stakers-distr-fees-convenience Stakers distr fees convenience commit a20b542 Author: Alex Gausman <[email protected]> Date: Wed Jul 20 18:58:52 2022 -0700 Finish changes commit 100ca42 Author: Alex Gausman <[email protected]> Date: Mon Jul 18 18:47:44 2022 -0700 Finish fixing tests commit 4606b8f Author: Alex Gausman <[email protected]> Date: Mon Jul 18 17:34:36 2022 -0700 Push incomplete changes commit 541b6eb Author: Alex Gausman <[email protected]> Date: Sun Jul 17 17:08:20 2022 -0700 Push incomplete changes commit 2d5d9ad Author: Ivan Martinez <[email protected]> Date: Sun Jul 17 10:21:46 2022 -0400 Disable all migration code commit 2dab748 Author: Alex Gausman <[email protected]> Date: Sat Jul 16 14:19:54 2022 -0700 remove flattened contracts commit a1bc533 Author: Alex Gausman <[email protected]> Date: Sat Jul 16 14:19:32 2022 -0700 add convenience functions commit 0e9f492 Author: Alex Gausman <[email protected]> Date: Thu Jul 14 14:03:38 2022 -0700 Fix script commit 512c73c Author: anon <[email protected]> Date: Thu Jul 14 12:58:10 2022 +0100 Marketplace0xZap deployment script commit 0eaa39d Author: Alex <[email protected]> Date: Wed Jul 13 19:42:39 2022 -0700 Add staker-fee-distr upgrade script for goerli commit 59eaeef Merge: d6af7f3 f9676b7 Author: Alex <[email protected]> Date: Wed Jul 13 11:00:34 2022 -0700 Merge pull request #20 from NFTX-project/stakers-distribute-fees-2 Stakers distribute fees 2 commit f9676b7 Author: Alex Gausman <[email protected]> Date: Mon Jul 11 20:13:05 2022 -0700 finish off tests commit b399bd7 Author: Alex Gausman <[email protected]> Date: Mon Jul 11 16:31:39 2022 -0700 Save test file commit e4550ba Author: Tom Wade <[email protected]> Date: Sat Jul 9 23:33:46 2022 +0100 Remove logging commit 8a8bd97 Author: Tom Wade <[email protected]> Date: Sat Jul 9 17:24:24 2022 +0100 Fix WETH payout issue in tests by supplying ETH commit 5e0a31a Author: Alex Gausman <[email protected]> Date: Fri Jul 8 12:43:04 2022 -0700 More tests commit 73a8163 Author: Alex Gausman <[email protected]> Date: Thu Jul 7 19:32:20 2022 -0700 Update contracts and tests commit 40b3dc4 Author: Tom Wade <[email protected]> Date: Sun Jul 3 10:25:16 2022 +0100 Start adding 1155 tests commit 42ae8d9 Author: Tom Wade <[email protected]> Date: Thu Jun 30 20:30:07 2022 +0100 Add 1155 support commit fd649d2 Author: Tom Wade <[email protected]> Date: Tue Jun 28 18:04:22 2022 +0100 Skip failing tests commit 8e324bc Author: Tom Wade <[email protected]> Date: Tue Jun 28 17:04:37 2022 +0100 Update 0x integration commit e7c222c Author: Tom Wade <[email protected]> Date: Mon Jun 27 16:30:44 2022 +0100 Add buyAndSwap tests commit bf828ec Author: Tom Wade <[email protected]> Date: Fri Jun 24 14:32:24 2022 +0100 First tests commit dd79330 Author: Tom Wade <[email protected]> Date: Thu Jun 23 13:52:08 2022 +0100 Start test suite commit 561a4fb Author: Tom Wade <[email protected]> Date: Mon Jun 20 23:59:16 2022 +0100 Add zap content commit 744d79f Author: Tom Wade <[email protected]> Date: Mon Jun 20 11:34:08 2022 +0100 Updates to 0x commit ca2a3e2 Author: Tom Wade <[email protected]> Date: Fri May 20 13:09:16 2022 +0100 wip commit 9f60370 Author: Tom Wade <[email protected]> Date: Tue May 10 15:37:30 2022 +0100 initial commit
# Conflicts: # hardhat.config.js
# Conflicts: # hardhat.config.js
# Conflicts: # contracts/solidity/testing/MockSushiSwap.sol
# Conflicts: # package.json
This reverts commit 9e4c633.
This reverts commit bf0c0ea. # Conflicts: # contracts/solidity/testing/MockSushiSwap.sol # hardhat.config.js
# Conflicts: # contracts/solidity/NFTXInventoryStaking.sol
# Conflicts: # contracts/solidity/testing/MockSushiSwap.sol
- Set swap target - Allow zap pausing - Set oanable - Set reentrancy guard - Remove passable swap target - Cry
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.
No description provided.