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

V2.0 #529

Merged
merged 1,114 commits into from
Sep 8, 2023
Merged

V2.0 #529

Changes from 1 commit
Commits
Show all changes
1114 commits
Select commit Hold shift + click to select a range
61dfeac
Remove IS_MASTER_COPY
ben-kaufman Sep 20, 2022
0b13079
Can't init master copy
ben-kaufman Sep 20, 2022
95c0cf3
Fix tests
ben-kaufman Sep 20, 2022
309d083
Merge pull request #371 from hats-finance/self-destruct-token-lock
jellegerbrandy Sep 21, 2022
fd06051
update claim doc
jellegerbrandy Sep 26, 2022
45afca2
Add arbitrator contract
ben-kaufman Sep 29, 2022
dbbdfa7
Update hattimelockcontroller.js
ben-kaufman Sep 29, 2022
62138e7
Fixes
ben-kaufman Sep 29, 2022
8bed036
rm HATBountySplit
lirona Oct 2, 2022
5cef4f2
fix setRewardController doc
lirona Oct 2, 2022
eb14a56
fix setCommittee docs
lirona Oct 7, 2022
ff2e56b
payout doc
lirona Oct 9, 2022
e5ad599
Update docs/claims.md
jellegerbrandy Oct 10, 2022
4a1132f
Update docs/claims.md
jellegerbrandy Oct 10, 2022
f9ae400
Update docs/claims.md
jellegerbrandy Oct 10, 2022
ed0a968
Update docs/claims.md
jellegerbrandy Oct 10, 2022
b92fd81
Merge pull request #372 from hats-finance/documentation
jellegerbrandy Oct 10, 2022
30f2962
rm references to HATBountySplit
lirona Oct 10, 2022
0d6af12
Add emergency pause to timelock whitelist
ben-kaufman Oct 11, 2022
54004fc
change to OnlyRegistryOwner
lirona Oct 19, 2022
ac7abae
Merge pull request #383 from hats-finance/377-vault-description-needs…
jellegerbrandy Oct 19, 2022
25685b9
Merge pull request #379 from hats-finance/little-fixes
jellegerbrandy Oct 19, 2022
3af096a
Sum gas averages
ben-kaufman Oct 25, 2022
b9e9255
Lint
ben-kaufman Oct 25, 2022
ba2911a
Merge pull request #385 from hats-finance/sum-gas-averages
jellegerbrandy Oct 26, 2022
9dabce0
Merge pull request #381 from hats-finance/emergency-pause-timelock-wh…
jellegerbrandy Oct 26, 2022
b5f5194
Merge branch 'develop' into arbitrator-contract
ben-kaufman Oct 26, 2022
37942f7
Update events
ben-kaufman Oct 26, 2022
f739e36
Add reward controller events
ben-kaufman Oct 26, 2022
f8ef212
Update contracts/interfaces/IHATVaultsRegistry.sol
ben-kaufman Oct 26, 2022
d802839
Update contracts/interfaces/IHATVaultsRegistry.sol
ben-kaufman Oct 26, 2022
d85ca1a
Update contracts/interfaces/IHATVaultsRegistry.sol
ben-kaufman Oct 26, 2022
db1894d
Update contracts/interfaces/IHATVaultsRegistry.sol
ben-kaufman Oct 26, 2022
db877ad
Update contracts/interfaces/IHATVaultsRegistry.sol
ben-kaufman Oct 26, 2022
e5b03ab
Update doc of VaultCreate event
ben-kaufman Oct 26, 2022
5c39667
Fix doc and add test
ben-kaufman Oct 26, 2022
48f2a9f
Tests
ben-kaufman Oct 27, 2022
73c0123
Update contracts/HATVault.sol
ben-kaufman Oct 27, 2022
172cfc7
rm OwnableInitializable
lirona Oct 27, 2022
66b15c2
rm MathUtils
lirona Oct 27, 2022
fcf4260
rm CloneFactory
lirona Oct 27, 2022
15b37a6
HATToken to inherit ERC20Votes & ERC20Capped (#384)
lirona Oct 28, 2022
15a19c7
New deployment scripts
ben-kaufman Oct 31, 2022
c3c1cd7
add comments about revoking
lirona Nov 3, 2022
aa2804c
change amount on constructor
lirona Nov 6, 2022
2d16c25
change amount in test
lirona Nov 6, 2022
736e6f3
fix test
lirona Nov 6, 2022
43ab2fd
Merge pull request #376 from hats-finance/arbitrator-contract
jellegerbrandy Nov 7, 2022
8b4bdd4
Merge pull request #388 from hats-finance/387-replace-contracts-in-th…
jellegerbrandy Nov 7, 2022
2b27385
Merge pull request #386 from hats-finance/update-events
jellegerbrandy Nov 7, 2022
df5af92
Apply suggestions from code review
jellegerbrandy Nov 7, 2022
d6e74ba
Merge pull request #408 from hats-finance/405-tokenlock-docs-needs-to…
jellegerbrandy Nov 7, 2022
9c7239c
Merge pull request #410 from hats-finance/407-maximum-amount-of-token…
jellegerbrandy Nov 7, 2022
9d9bf52
Merge branch 'develop' into deploy-scripts
ben-kaufman Nov 8, 2022
e681696
Fixes
ben-kaufman Nov 8, 2022
9c582aa
Fixes
ben-kaufman Nov 8, 2022
34ded70
Fixes
ben-kaufman Nov 8, 2022
79a8755
calldata, state vars access, unchecked, conditions order
lirona Nov 9, 2022
6381b87
add registry getters - gas 6814081
lirona Nov 9, 2022
8e24158
more state vars access, HATTokenLock init
lirona Nov 9, 2022
da92d12
state var access in modifier - 6792969
lirona Nov 9, 2022
877a15b
state vars access - 6791720
lirona Nov 9, 2022
f28e926
swapAndSend, state var access - 6790730
lirona Nov 9, 2022
a3b90d3
do not commit gas-report.txt
jellegerbrandy Nov 10, 2022
8e58ea8
setAllocPoint - 6790676
lirona Nov 10, 2022
f7dc8c7
rewardController state vars, unchecked - 6789735
lirona Nov 10, 2022
dd7bf83
more rewardController state vars, unchecked - 6788968
lirona Nov 10, 2022
293baa8
todos
lirona Nov 10, 2022
e0771b1
i++ -> ++i - 6788924
lirona Nov 10, 2022
e8eabe4
this should fix #392
jellegerbrandy Nov 10, 2022
6cf9c40
linter errors plus more checks
jellegerbrandy Nov 10, 2022
0f39b64
fix linter errors, extend test, cover withdrawl case
jellegerbrandy Nov 10, 2022
5535565
move logic to _afterTokenTransfer
jellegerbrandy Nov 11, 2022
996bb64
simplify error handling on min deposit check
jellegerbrandy Nov 11, 2022
5f1f750
remove a line
jellegerbrandy Nov 11, 2022
2726cc3
previewWithdrawAndFee, previewRedeemAndFee - 6937976
lirona Nov 13, 2022
db75a92
_calcClaimBounty - 6938238
lirona Nov 13, 2022
0dca307
SwapAndSend - 6938492
lirona Nov 13, 2022
667ccbb
RewardController - 6939230
lirona Nov 13, 2022
7726826
transfer -> call
lirona Nov 13, 2022
7f7b77c
Add missing arbitrator addr to event
ben-kaufman Nov 15, 2022
69b9316
Add prev alloc points of vault when setting the alloc point
ben-kaufman Nov 15, 2022
4238b45
Merge pull request #401 from hats-finance/deploy-scripts
jellegerbrandy Nov 15, 2022
42c2490
Merge branch 'develop' into 398-mulDiv
jellegerbrandy Nov 15, 2022
2ae4abb
Merge pull request #419 from hats-finance/398-mulDiv
jellegerbrandy Nov 15, 2022
4d5523e
Merge pull request #421 from hats-finance/missing-event-arb-addr
jellegerbrandy Nov 15, 2022
fbeefb3
reorder and change types of state vars - 6231065
lirona Nov 15, 2022
58436c9
rm todos
lirona Nov 15, 2022
c07f2bb
custom error
lirona Nov 16, 2022
588994b
add test for fail
lirona Nov 16, 2022
14d06b4
Merge branch 'develop' into gas-optimization
lirona Nov 16, 2022
2824b5b
Merge branch 'develop' into 406-call-instead-of-transfer
lirona Nov 16, 2022
3fcc552
rm getGeneralParameters
lirona Nov 16, 2022
5ebd400
HATVault
lirona Nov 16, 2022
78df928
HATVaultsRegistry
lirona Nov 16, 2022
b956844
RewardController
lirona Nov 16, 2022
fb3791e
set MINIMAL_AMOUNT_OF_SHARES to 1000
jellegerbrandy Nov 16, 2022
364b415
Merge pull request #420 from hats-finance/406-call-instead-of-transfer
jellegerbrandy Nov 16, 2022
1100762
Merge branch 'develop' into fix-392
jellegerbrandy Nov 16, 2022
bb193f5
Merge branch 'develop' into gas-optimization
jellegerbrandy Nov 17, 2022
4c1b89b
Merge pull request #416 from hats-finance/gas-optimization
jellegerbrandy Nov 17, 2022
0ae67ba
fix test
jellegerbrandy Nov 17, 2022
f699c4c
Merge branch 'develop' into fix-392
jellegerbrandy Nov 17, 2022
d6a2ac3
forgot an .only
jellegerbrandy Nov 17, 2022
e3183de
Merge pull request #418 from hats-finance/fix-392
jellegerbrandy Nov 17, 2022
ebe0a87
Merge branch 'develop' into 417-name-internal-vars-with-an-underscore
jellegerbrandy Nov 17, 2022
262121b
fix hardhat config
jellegerbrandy Nov 17, 2022
e53c94d
Merge pull request #422 from hats-finance/417-name-internal-vars-with…
jellegerbrandy Nov 17, 2022
85bac87
Update HATVault.sol
lirona Nov 17, 2022
f082a27
Add vault name and symbol
ben-kaufman Nov 17, 2022
a07fb98
Support goerli optimism
ben-kaufman Nov 17, 2022
8f0be44
Fix coverage
ben-kaufman Nov 17, 2022
e6a3eb9
New goerli optimism addresses
ben-kaufman Nov 17, 2022
becab31
Update HATVaultsRegistry.sol
lirona Nov 17, 2022
e456827
Update RewardController.sol
lirona Nov 17, 2022
e081eba
Add full modifiers coverage
ben-kaufman Nov 17, 2022
a861038
Merge pull request #424 from hats-finance/goerli-optimism-support
jellegerbrandy Nov 17, 2022
77761c4
Merge pull request #425 from hats-finance/gas-optimization-fixes
jellegerbrandy Nov 17, 2022
c287a30
setTransferable
lirona Nov 20, 2022
5207531
1 more test
lirona Nov 20, 2022
5cb883c
rm unnecessary setTransferable
lirona Nov 20, 2022
cd83202
CloneFactoryMock
lirona Nov 21, 2022
4d8cb22
install dodoc & create docs
lirona Nov 22, 2022
8147566
hardhat.cofig
lirona Nov 22, 2022
510b3ea
Merge pull request #428 from hats-finance/CloneFactoryMock-to-use-OZ'…
lirona Nov 22, 2022
1bf8de4
event, error name in test
lirona Nov 22, 2022
53396fc
readme
lirona Nov 23, 2022
6d88e1b
fix readme
lirona Nov 23, 2022
7461cf4
try subfolder
lirona Nov 23, 2022
babbe34
mv folder dodc->dodocs, mv ISwapRouter to mocks, fix README
lirona Nov 23, 2022
c49fbb4
README smaller titles
lirona Nov 23, 2022
4aa591d
Add vault name arg
ben-kaufman Nov 23, 2022
28a4dcc
Merge branch 'develop' into erc20-name-symbol
ben-kaufman Nov 23, 2022
c1fe58b
README fix
lirona Nov 23, 2022
c170dfb
Fix test
ben-kaufman Nov 23, 2022
71f908d
README titles
lirona Nov 23, 2022
95b5167
README titles
lirona Nov 23, 2022
a74488c
README capitals
lirona Nov 23, 2022
67cb87c
result can be 252 or 253
lirona Nov 23, 2022
9d5326d
oops :) rm only from test
lirona Nov 23, 2022
5408dd6
Merge pull request #427 from hats-finance/426-hat-token-to-start-untr…
jellegerbrandy Nov 24, 2022
4bd831d
Spelling fix
ben-kaufman Nov 24, 2022
26c401d
Fix typo
ben-kaufman Nov 24, 2022
42d465f
Merge pull request #431 from hats-finance/351-tokenlock-sincestarttim…
jellegerbrandy Nov 24, 2022
3c30622
mv modifier
lirona Nov 24, 2022
a1cb29b
Merge pull request #429 from hats-finance/141-generate-and-publish-docs
jellegerbrandy Nov 25, 2022
6063e59
Merge pull request #433 from hats-finance/tokenlock-modifier-bf-const…
jellegerbrandy Nov 25, 2022
315f75c
fix test
jellegerbrandy Nov 25, 2022
d8dd0d8
Merge pull request #423 from hats-finance/erc20-name-symbol
jellegerbrandy Nov 28, 2022
3b1ff97
some docs tweaking
jellegerbrandy Nov 29, 2022
a9fcdd2
registry.owner (#434)
shayzluf Nov 30, 2022
47c447c
msgSender
lirona Dec 1, 2022
13b976c
Add reward controller
ben-kaufman Dec 1, 2022
da554db
reset hackersHatReward + test
lirona Dec 1, 2022
46a853d
rm return
lirona Dec 1, 2022
cfadb77
add =
lirona Dec 1, 2022
fc80965
Apply suggestions from code review
jellegerbrandy Dec 2, 2022
9ec1f13
Merge pull request #435 from hats-finance/improve-docs
jellegerbrandy Dec 2, 2022
1fa774b
Merge pull request #445 from hats-finance/440-hexens-reaudit-2-using-…
jellegerbrandy Dec 2, 2022
cce7cba
Merge pull request #447 from hats-finance/441-hexens-reaudit-3-duplic…
jellegerbrandy Dec 2, 2022
9f3439c
Merge pull request #448 from hats-finance/443-hexens-reaudit-5-redund…
jellegerbrandy Dec 2, 2022
19a66ca
remove unnecessary imports
lirona Dec 5, 2022
bd46eda
Merge pull request #450 from hats-finance/remove-import
jellegerbrandy Dec 5, 2022
d6b91f2
Merge pull request #449 from hats-finance/444-hexens-reaudit-6-incorr…
jellegerbrandy Dec 5, 2022
08dbf46
Simplify htc change
ben-kaufman Dec 5, 2022
a6e676a
Merge pull request #446 from hats-finance/add-reward-controller
jellegerbrandy Dec 5, 2022
8213b77
Add ERC5143 slippage protected methods
ben-kaufman Dec 5, 2022
329a783
Merge pull request #451 from hats-finance/erc5143
jellegerbrandy Dec 6, 2022
b671a14
tweak doc
jellegerbrandy Dec 12, 2022
4cb8990
..
jellegerbrandy Dec 12, 2022
469f905
small changes
jellegerbrandy Dec 13, 2022
1aa7813
make deploymnetscript also work with no reward controller
jellegerbrandy Dec 13, 2022
edb5afa
.
jellegerbrandy Dec 14, 2022
4db322a
rewardcontrollers
jellegerbrandy Dec 14, 2022
3a56dcf
all tests
jellegerbrandy Dec 14, 2022
824926f
fix some more tests
jellegerbrandy Dec 14, 2022
7b86443
another test
jellegerbrandy Dec 14, 2022
a0fa85c
fix test
jellegerbrandy Dec 14, 2022
869cc30
fix lint error in test
jellegerbrandy Dec 14, 2022
a6a00a5
fix parameters.md
lirona Dec 14, 2022
cb9188c
?
lirona Dec 14, 2022
24843a2
!
lirona Dec 14, 2022
16c0db2
update tests
jellegerbrandy Dec 16, 2022
66d1c12
tweaks in deploy and verification scripts
jellegerbrandy Dec 16, 2022
57bf8b5
Merge pull request #457 from hats-finance/455-polygon-deployment
jellegerbrandy Dec 16, 2022
ed2af69
Merge pull request #458 from hats-finance/453-adjust-documentation
jellegerbrandy Dec 16, 2022
dc84e2b
Add vault NFT contracts
ben-kaufman Dec 25, 2022
3afd21e
Lint
ben-kaufman Dec 25, 2022
87025fc
Fix tests
ben-kaufman Dec 26, 2022
241500c
Fix tests
ben-kaufman Dec 26, 2022
389ec92
Set swap token
ben-kaufman Dec 27, 2022
dc30b6f
Add slippage protected withdraw/redeem with claim
ben-kaufman Dec 27, 2022
c3245e9
Merge pull request #462 from hats-finance/set-swaptoken
jellegerbrandy Jan 2, 2023
18a61e5
Merge pull request #463 from hats-finance/withdraw-and-claim-min-amounts
jellegerbrandy Jan 2, 2023
0137601
Merge pull request #459 from hats-finance/add-nft-contracts
jellegerbrandy Jan 2, 2023
abaa65e
Merge branch 'develop' into 453-docs
jellegerbrandy Jan 2, 2023
c0adf0d
Merge pull request #454 from hats-finance/453-docs
jellegerbrandy Jan 2, 2023
8100cfc
WIP
ben-kaufman Jan 5, 2023
dfd0f05
Deploy registry
ben-kaufman Jan 5, 2023
5837abb
Update 005_deploy_reward_controllers.js
ben-kaufman Jan 5, 2023
76882c8
Config reward and swap tokens
ben-kaufman Jan 6, 2023
6ee8541
Add NFT deployment
ben-kaufman Jan 6, 2023
8bb6982
upgrade oz dependencies to 4.8.0
jellegerbrandy Jan 11, 2023
1506b72
set optonal admin role in TimeLock to address(0)
jellegerbrandy Jan 11, 2023
f20c93f
fix naming of event in tests
jellegerbrandy Jan 11, 2023
7673415
fix failing test
jellegerbrandy Jan 11, 2023
2228129
new docs
jellegerbrandy Jan 11, 2023
bade0a4
Only deploy hattoken on hardhat network
ben-kaufman Jan 11, 2023
2005a15
Add deployment sanity checks
ben-kaufman Jan 11, 2023
8bcb9de
Lint
ben-kaufman Jan 12, 2023
8ab1417
Change config to js
ben-kaufman Jan 13, 2023
c7fee04
Lint
ben-kaufman Jan 13, 2023
f42bf7c
Goerli deployment and fixes
ben-kaufman Jan 13, 2023
eb7b264
Lint
ben-kaufman Jan 13, 2023
59c8119
Merge pull request #468 from hats-finance/hardhat-deploy
jellegerbrandy Jan 17, 2023
33baea8
sepolia deployment, twaeks in deploymnet scripts
jellegerbrandy Jan 17, 2023
80ec232
upgrade to 4.8.1
jellegerbrandy Jan 17, 2023
4e95097
Merge branch 'develop' into hardhat-deploy-2
jellegerbrandy Jan 17, 2023
da0ee05
more tweaks
jellegerbrandy Jan 17, 2023
835fcd3
Merge pull request #467 from hats-finance/upgrade-openzeppelin
jellegerbrandy Jan 17, 2023
271dead
Merge branch 'develop' into hardhat-deploy-2
jellegerbrandy Jan 17, 2023
e0afe94
Add duplicated check for adding reward controller
ben-kaufman Jan 17, 2023
dc5c7d7
update .env.example
jellegerbrandy Jan 18, 2023
2c60b45
Merge pull request #470 from hats-finance/dup-check-reward-controller
jellegerbrandy Jan 18, 2023
9b12bd1
run deployment scripts on each test
jellegerbrandy Jan 18, 2023
898d9c9
new sepolia deployment
jellegerbrandy Jan 18, 2023
84ab83d
fix lint errors
jellegerbrandy Jan 18, 2023
7d3452c
typo
jellegerbrandy Jan 18, 2023
ee974d8
fix typo
jellegerbrandy Jan 18, 2023
95ff820
Merge pull request #469 from hats-finance/hardhat-deploy-2
jellegerbrandy Jan 18, 2023
75bf659
update params doc
jellegerbrandy Feb 20, 2023
4f5a315
Update deployment.md
ben-kaufman Feb 21, 2023
282e0ed
Deployment
ben-kaufman Feb 22, 2023
114cb9f
Fix verify
ben-kaufman Feb 23, 2023
a9d65dd
Fix tx hashes
ben-kaufman Feb 23, 2023
ede5afe
Update .env.example
ben-kaufman Feb 23, 2023
9cf655b
..
jellegerbrandy Mar 3, 2023
195e37f
add scope to package name
jellegerbrandy Mar 3, 2023
8e8c578
bump version number
jellegerbrandy Mar 3, 2023
abe6cbb
publish it as public
jellegerbrandy Mar 3, 2023
8648737
Merge pull request #474 from hats-finance/deployment
jellegerbrandy Mar 8, 2023
0076e41
update new audits and rename olders ones
jellegerbrandy Mar 14, 2023
6715be7
add g0 aduit
jellegerbrandy Mar 14, 2023
41d6631
Merge pull request #482 from hats-finance/hexen-audit-report
jellegerbrandy Mar 14, 2023
2d87c8f
Merge pull request #472 from hats-finance/docs
jellegerbrandy Mar 14, 2023
9849e3d
Merge branch 'develop' into fix-verify-doc
jellegerbrandy Mar 14, 2023
a97f7ec
Merge pull request #473 from hats-finance/fix-verify-doc
jellegerbrandy Mar 14, 2023
3ff18a3
Merge pull request #475 from hats-finance/npmjs-package
jellegerbrandy Mar 14, 2023
f998e23
Merge branch 'main' into v2.0
jellegerbrandy Sep 7, 2023
c4f7c7e
Move hardhat-dodoc to dev dependencies
ben-kaufman Sep 7, 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
Update HATVault.sol
  • Loading branch information
lirona authored Nov 17, 2022
commit 85bac87ec05cede3a794d38e26f569fa5e760b4c
2 changes: 1 addition & 1 deletion contracts/HATVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ contract HATVault is IHATVault, ERC4626Upgradeable, OwnableUpgradeable, Reentran
}

function challengeClaim(bytes32 _claimId) external isActiveClaim(_claimId) {
if (msg.sender != activeClaim.arbitrator && msg.sender != registry.owner())
if (msg.sender != activeClaim.arbitrator && msg.sender != registry.owner())
revert OnlyArbitratorOrRegistryOwner();
// solhint-disable-next-line not-rely-on-time
if (block.timestamp > activeClaim.createdAt + activeClaim.challengePeriod)
Expand Down