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.

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

issue #328 (Nightly Draft) #330

Closed
wants to merge 47 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
caf51db
issue #328
Lomet Oct 2, 2023
c803ded
fix length misstype
Lomet Oct 2, 2023
fe59089
add CalcUtils
Lomet Oct 2, 2023
9d5c9f3
fix brakets
Lomet Oct 2, 2023
75001a7
remove pure
Lomet Oct 2, 2023
685fd01
add pure
Lomet Oct 2, 2023
678a5b7
add UpgradeType
Lomet Oct 2, 2023
445328b
add require for UpgradeType
Lomet Oct 2, 2023
9626199
fix CreateNewDelayVault
Lomet Oct 2, 2023
c23d19b
add more code
Lomet Oct 2, 2023
d430455
add _getWithdrawPoolParams
Lomet Oct 2, 2023
c985989
add require
Lomet Oct 2, 2023
c7032a8
ProviderState was red
Lomet Oct 2, 2023
7a96a67
extract some code
Lomet Oct 2, 2023
752bfcf
add some code
Lomet Oct 2, 2023
c045aca
add type(uint256).max
Lomet Oct 2, 2023
cee603a
order
Lomet Oct 2, 2023
552df73
some code
Lomet Oct 2, 2023
7d8c4ec
make pure
Lomet Oct 2, 2023
00e2392
some refactor
Lomet Oct 2, 2023
6ecc275
reorder
Lomet Oct 2, 2023
e4a66c7
swap imports
Lomet Oct 2, 2023
d96cd13
order
Lomet Oct 2, 2023
d746b1b
add event
Lomet Oct 2, 2023
e19b2df
typo
Lomet Oct 2, 2023
574655a
add if
Lomet Oct 2, 2023
fb98c54
add owner to createNewDelayVault
Lomet Oct 3, 2023
fa9a067
delay vault migrator (#337)
Lomet Oct 3, 2023
840af1d
Merge branch 'master' into Issue_#328
Lomet Oct 3, 2023
6a0a324
Update LockDealNFT.sol
Lomet Oct 3, 2023
553ba0f
add else if
Lomet Oct 3, 2023
2e3707c
remove return
Lomet Oct 3, 2023
1bb4c33
refactor
Lomet Oct 3, 2023
322e28a
refaactor
Lomet Oct 3, 2023
b47bb7f
some renames
Lomet Oct 3, 2023
4b2c9cd
requires fix (#338)
YouStillAlive Oct 4, 2023
da47a99
avoid duplicate vaultManager address (#340)
YouStillAlive Oct 4, 2023
68725e4
use camelCase (#339)
YouStillAlive Oct 4, 2023
c683b66
Merge branch 'master' into Issue_#328
Lomet Oct 5, 2023
86e2b0c
add ILockDealV2
Lomet Oct 5, 2023
e4c396c
added tests (#342)
YouStillAlive Oct 5, 2023
68c3324
Merge branch 'master' into Issue_#328
YouStillAlive Oct 11, 2023
c0604ac
`DelayProvider` tests (#345)
YouStillAlive Oct 11, 2023
8aa6535
Merge branch 'master' into Issue_#328
Lomet Oct 11, 2023
4ac7413
Merge branch 'master' into Issue_#328
YouStillAlive Oct 13, 2023
5e41327
build fixing
YouStillAlive Oct 13, 2023
fa24c5f
migrator preparations (#352)
YouStillAlive Oct 18, 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
Prev Previous commit
Next Next commit
add else if
Lomet committed Oct 3, 2023
commit 553ba0ff6a0c04bfcf5e9f845b9599f66329bac2
2 changes: 1 addition & 1 deletion contracts/DelayVaultProvider/DelayVaultProvider.sol
Original file line number Diff line number Diff line change
@@ -58,6 +58,6 @@ contract DelayVaultProvider is DelayVaultState {
}

function _isAllowedChanheType(address owner) internal view returns (bool) {
return owner == msg.sender || lockDealNFT.approvedProviders(msg.sender);
return owner == msg.sender || lockDealNFT.approvedContracts(msg.sender);
}
}
2 changes: 1 addition & 1 deletion contracts/DelayVaultProvider/DelayVaultState.sol
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ abstract contract DelayVaultState is DealProviderState, LastPoolOwnerState, Hold
if (to == address(lockDealNFT))
// this means it will be withdraw or split
LastPoolOwner[poolId] = from; //this is the only way to know the owner of the pool
else {
else if (from != address(0) && !nftContract.approvedContracts(from)) {
_handleTransfer(from, to, poolId);
}
}