Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
36c4aa1
Add Merkle eligibility logic for ENS vaults (#24)
Aug 2, 2022
617511d
Merge pull request #27 from NFTX-project/feature/ens-eligibility
Capsicle1 Aug 2, 2022
8271faa
Update merkle to allow as implementation (#28)
tomwade Aug 5, 2022
cacf3dc
Optimise ENS merkle flow (#29)
tomwade Aug 9, 2022
cbc680f
Add 0x Marketplace Zap (#18)
tomwade Sep 13, 2022
ab63212
Allow merkle eligibility expiration check in `init_bytes` rather than…
tomwade Sep 13, 2022
bf0c0ea
Squashed commit of the following:
tomwade Nov 2, 2022
bb115b8
initial commit
tomwade Jun 28, 2022
978fe3d
Add return value
tomwade Jul 3, 2022
4fe40bb
Bypass local stack variable issues
tomwade Jul 4, 2022
2aa3289
Update minting flow
tomwade Jul 4, 2022
d489bff
Make _getBoolean pure
tomwade Jul 4, 2022
ed2b935
Add 1155 support
tomwade Jul 4, 2022
5bcbfa0
Move fee allocation
tomwade Jul 4, 2022
6612894
Add code commenting
tomwade Jul 4, 2022
b39b43d
Fix documentation
tomwade Jul 4, 2022
ccb05f1
Remove console logging
tomwade Jul 4, 2022
9e4c633
Enable gas reporting
tomwade Jul 4, 2022
1d48ee5
Comments and 1155 test
tomwade Jul 4, 2022
5ac99dd
Fix 1155 recipient address going to vault
tomwade Jul 4, 2022
9b7c5e0
Enable minting in 1155 test
tomwade Jul 4, 2022
7dd5fd2
Add 1155 support
tomwade Jul 4, 2022
df7681b
Convert binary to uint
tomwade Jul 6, 2022
a2e57b9
All 0 value for eligibility index
tomwade Jul 6, 2022
660d2cb
Add deploy script
tomwade Jul 14, 2022
f6f7669
Add liquidity and inventory staking support
tomwade Oct 11, 2022
514ed4a
Use SushiHelper
tomwade Oct 12, 2022
4f62b52
Add new test suite
tomwade Oct 12, 2022
a90cb55
Fix variable casing
tomwade Oct 12, 2022
56080c2
Update LP staking to be a mock
tomwade Oct 13, 2022
0d7a444
Revert "Enable gas reporting"
tomwade Nov 2, 2022
9e023eb
Revert "Squashed commit of the following:"
tomwade Nov 2, 2022
9765a61
Add Yield Staking Zap
tomwade Sep 1, 2022
670be82
Add test and deploy script
tomwade Sep 2, 2022
7129174
Update tests
tomwade Sep 7, 2022
6b84ef6
Staking updates
tomwade Sep 13, 2022
592006f
Updates
tomwade Sep 13, 2022
f2de783
Fix typos
tomwade Sep 14, 2022
df0df34
Update to use minTokenIn
tomwade Sep 20, 2022
2376611
Make swap target immutable on deployment
tomwade Sep 23, 2022
6dc9a71
Use a mapping for zap contracts
tomwade Sep 23, 2022
aed6db5
Update test constructors
tomwade Sep 30, 2022
a27ff85
Add DustReturned event
tomwade Sep 13, 2022
4350a5f
Update to fix contract issues
tomwade Sep 13, 2022
8e76199
Add MANY fixes
tomwade Sep 13, 2022
cc2c7fa
Add payable
tomwade Sep 13, 2022
8b77e06
Fix typos (onlyOnwer)
tomwade Sep 14, 2022
573765b
Move paused check to modifier
tomwade Sep 14, 2022
7100c93
Move modifier to external functions
tomwade Sep 14, 2022
7760d1b
Make swap target immutable
tomwade Sep 23, 2022
2e04c82
Ensure address is payable
tomwade Sep 23, 2022
1bd12ae
Add tests for pausing logic
tomwade Sep 23, 2022
4dd1e6a
Remove unused BASE variable
tomwade Sep 23, 2022
97aa8e3
Update to goerli key
tomwade Nov 2, 2022
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ flattened
#Hardhat files
cache
artifacts
hardhat.config.local.js
4 changes: 2 additions & 2 deletions contracts/solidity/NFTXInventoryStaking.sol
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ contract NFTXInventoryStaking is PausableUpgradeable, UpgradeableBeacon, INFTXIn

function timelockMintFor(uint256 vaultId, uint256 amount, address to, uint256 timelockLength) external virtual override returns (uint256) {
onlyOwnerIfPaused(10);
require(msg.sender == nftxVaultFactory.zapContract(), "Not staking zap");
require(nftxVaultFactory.excludedFromFees(msg.sender), "Not fee excluded"); // important for math that staking zap is excluded from fees
require(nftxVaultFactory.zapContracts(msg.sender), "Not staking zap");
require(nftxVaultFactory.excludedFromFees(msg.sender), "Not fee excluded");

(, , uint256 xTokensMinted) = _timelockMintFor(vaultId, to, amount, timelockLength);
emit Deposit(vaultId, amount, xTokensMinted, timelockLength, to);
Expand Down
Loading