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

Dev #17

Merged
merged 149 commits into from
Feb 17, 2024
Merged

Dev #17

Show file tree
Hide file tree
Changes from 128 commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
ea5c19d
start games & tournaments
funkornaut001 Jan 19, 2024
774d051
main page updated
funkornaut001 Jan 19, 2024
3f4739b
main->funk + vrf + singlegame
funkornaut001 Jan 26, 2024
a77207b
Cleanup of old files
perfectride Jan 26, 2024
2bccecf
Merge pull request #1 from 0xBcamp/newFeatureBranch
0xwetzo Jan 26, 2024
96619bb
Removed reward tokens
perfectride Jan 26, 2024
62514b0
Merge pull request #2 from 0xBcamp/newFeatureBranch
0xwetzo Jan 26, 2024
44446f7
Removed reward tokens
perfectride Jan 26, 2024
7c68093
Added DeFi token logic
perfectride Jan 26, 2024
62773ba
Added comments
perfectride Jan 26, 2024
5f7df09
Cleaned up code
perfectride Jan 26, 2024
695955b
Debugged contract
perfectride Jan 26, 2024
ca9fefc
Debugged contract
perfectride Jan 26, 2024
51fa34e
pvp - foundry added
funkornaut001 Jan 27, 2024
471f400
pvp - foundry
funkornaut001 Jan 27, 2024
aa3676f
ownable - getters
funkornaut001 Jan 27, 2024
bee00c0
Resolved merge conflicts by keeping current branch versions of yarn.l…
funkornaut001 Jan 27, 2024
9be67e4
attempt mock deploy - add notes
funkornaut001 Jan 27, 2024
41ebeb1
Merge remote-tracking branch 'origin/dev' into funk
funkornaut001 Jan 27, 2024
508dfed
Improved fake LP tokens
perfectride Jan 27, 2024
4d2c2fb
Debug token interractions
perfectride Jan 27, 2024
81878fc
resolve game logic fix - lives given back
funkornaut001 Jan 27, 2024
e6e2568
update tournament with play funcs
funkornaut001 Jan 27, 2024
1657d4e
Leaderboard added
perfectride Jan 27, 2024
b1d372d
Leaderboard added
perfectride Jan 27, 2024
412a9ef
Merge pull request #3 from 0xBcamp/newFeatureBranch
0xwetzo Jan 27, 2024
b76bfe1
tournament getters - pvp checks
funkornaut001 Jan 27, 2024
7b9dda6
start test
funkornaut001 Jan 27, 2024
dbab3e6
Tournament updated
perfectride Jan 27, 2024
223dfac
Merge pull request #4 from 0xBcamp/newFeatureBranch
0xwetzo Jan 27, 2024
8ef07bf
CSS improvment
perfectride Jan 27, 2024
0485ecb
Merge pull request #5 from 0xBcamp/newFeatureBranch
0xwetzo Jan 27, 2024
2273331
CSS improvment
perfectride Jan 27, 2024
c4e1d37
CSS improvment
perfectride Jan 27, 2024
8b9eaa4
Events added to play
perfectride Jan 28, 2024
0f5dc67
Merge pull request #6 from 0xBcamp/newFeatureBranch
0xwetzo Jan 28, 2024
a7fb4b8
Managed by date instead of timestamp
perfectride Jan 28, 2024
3bfc8dd
Improved UI on tournament list
perfectride Jan 28, 2024
e9a7b69
Fixed game logic
perfectride Jan 29, 2024
7d77f7b
Updated tournament list
perfectride Jan 29, 2024
6fb45e9
testing - setUp - mockVRF
funkornaut001 Jan 29, 2024
8d0daa3
Updated tournament list
perfectride Jan 30, 2024
6d6db52
Show users tournament
perfectride Jan 30, 2024
89ecaa1
Removed external ERC20 to use wagmi erc20ABI instead
perfectride Jan 30, 2024
1437917
tests
funkornaut001 Jan 30, 2024
021c301
Fixed solidty string comparison
perfectride Jan 31, 2024
54053b5
Added token methodes on interfaces
perfectride Jan 31, 2024
96e8fad
Merge pull request #7 from 0xBcamp/newFeatureBranch
0xwetzo Jan 31, 2024
02442e7
Merge branch 'dev' into funk
funkornaut001 Jan 31, 2024
f373657
Merge pull request #8 from 0xBcamp/funk
funkornaut001 Jan 31, 2024
df8e051
Removed duplicates
perfectride Jan 31, 2024
1e08ddc
Added Foundry folder
perfectride Jan 31, 2024
d295b16
Added foundry directories
perfectride Jan 31, 2024
cf371e5
Delete tmp files
perfectride Jan 31, 2024
9b31424
Removed stored name/decimals for LP token
perfectride Feb 1, 2024
9b5e845
Merge pull request #9 from 0xBcamp/cleanContract
0xwetzo Feb 1, 2024
c61ac4e
Added tests
perfectride Feb 2, 2024
27e3cab
Added unstaking tests
perfectride Feb 2, 2024
5c6ed31
More tests and fixes
perfectride Feb 2, 2024
1bb1cba
Added tests
perfectride Feb 2, 2024
0fac102
Fixed getRank
perfectride Feb 2, 2024
d81ad3c
Merge pull request #10 from 0xBcamp/foundry
0xwetzo Feb 2, 2024
1d5b792
Added tests
perfectride Feb 3, 2024
a67ff43
getFees updated
perfectride Feb 3, 2024
accd5c8
Fixed withdrawal giving too much
perfectride Feb 3, 2024
90db343
Updated player tuple
perfectride Feb 3, 2024
031a2f9
Bug fixes
perfectride Feb 3, 2024
4f7ceea
Fixed constructor
perfectride Feb 3, 2024
8145852
Merge pull request #11 from 0xBcamp/foundry
0xwetzo Feb 3, 2024
8d480a4
Added tests
perfectride Feb 3, 2024
6281291
Merge pull request #12 from 0xBcamp/foundry
0xwetzo Feb 3, 2024
de6a10e
Added Uniswap tests
perfectride Feb 4, 2024
7b22b3e
More Uniswap tests
perfectride Feb 4, 2024
e1b1036
More tests
perfectride Feb 4, 2024
4daa306
Improved tests
perfectride Feb 4, 2024
344d8de
Merge pull request #13 from 0xBcamp/foundry
0xwetzo Feb 4, 2024
4cbb030
Tested 100% lines
perfectride Feb 4, 2024
7c19cbe
Merge pull request #14 from 0xBcamp/foundry
0xwetzo Feb 4, 2024
0ef950d
Fixed Uniswap PricePerShare
perfectride Feb 5, 2024
6f36e77
Merge pull request #15 from 0xBcamp/foundry
0xwetzo Feb 5, 2024
efeadbf
Improved withdrawal
perfectride Feb 6, 2024
7ea8995
Merge pull request #16 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
e20e3b6
Fixed: initial nbRank should be 1
perfectride Feb 6, 2024
89c4507
Final withdrawal fix
perfectride Feb 6, 2024
4475ada
Merge pull request #18 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
c2bf3a4
Make sure no ERC20 is stuck
perfectride Feb 6, 2024
7545de9
Redeployed contracts
perfectride Feb 6, 2024
f8e1d73
Merge pull request #19 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
9a05752
Added dev dependency hardhat-foundry
perfectride Feb 6, 2024
4e0925c
Merge pull request #20 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
521fa49
Add lockfile
perfectride Feb 6, 2024
05fea5f
Merge pull request #21 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
f4f4fed
Withdraw component updated
perfectride Feb 6, 2024
7296323
Merge pull request #22 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
3dad500
Added foundry at root
perfectride Feb 6, 2024
74aa7ee
Merge pull request #23 from 0xBcamp/foundry
0xwetzo Feb 6, 2024
0534a64
Fixed pricePerShare overflow
perfectride Feb 7, 2024
51b1322
Merge pull request #24 from 0xBcamp/foundry
0xwetzo Feb 7, 2024
7cb9b2e
Change uint ranges
perfectride Feb 7, 2024
f09231f
Added streak point system
perfectride Feb 9, 2024
c49b7a2
Merge pull request #25 from 0xBcamp/foundry
0xwetzo Feb 9, 2024
f93e541
Try to solve github lint issue
perfectride Feb 9, 2024
f433b60
Merge pull request #26 from 0xBcamp/foundry
0xwetzo Feb 9, 2024
3c3bb0c
Added fancy symbol for Uni LP
perfectride Feb 10, 2024
ba4a5e1
Merge pull request #27 from 0xBcamp/foundry
0xwetzo Feb 10, 2024
00b6ca3
Use of proxies
perfectride Feb 10, 2024
936e3d1
Updated test file for proxy
perfectride Feb 10, 2024
dad91cb
Fixed late staking risk
perfectride Feb 10, 2024
98d8927
Merge pull request #28 from 0xBcamp/proxy
0xwetzo Feb 10, 2024
f7e6b22
Made factory also VRF manager
perfectride Feb 10, 2024
2e54fd0
Simplifications
perfectride Feb 10, 2024
2de7048
Fixed expected prize for ended tournament
perfectride Feb 10, 2024
4a3b41f
Fixed possible div by 0
perfectride Feb 10, 2024
0e4d28c
Now uses fancy symbol
perfectride Feb 10, 2024
58c4ab0
Merge pull request #29 from 0xBcamp/proxy
0xwetzo Feb 10, 2024
97adc6f
Fixed stakingAllowed bug
perfectride Feb 10, 2024
50dcd49
Fixed tests with VRF
perfectride Feb 10, 2024
5c2ecd1
Merge pull request #30 from 0xBcamp/proxy
0xwetzo Feb 10, 2024
1ee5cdc
Various improvments
perfectride Feb 10, 2024
40b4c3e
Merge pull request #31 from 0xBcamp/proxy
0xwetzo Feb 10, 2024
21cec04
Unified resolve functions
perfectride Feb 10, 2024
7c9a01e
Cleaner code
perfectride Feb 10, 2024
ab00b92
Now use hashes to hide player moves
perfectride Feb 11, 2024
48b8e5b
Fixed visibility
perfectride Feb 11, 2024
d30c88a
Tests updated
perfectride Feb 11, 2024
a5a913b
Merge pull request #32 from 0xBcamp/proxy
0xwetzo Feb 11, 2024
7f137c9
Cleaning
perfectride Feb 11, 2024
d76a7b4
Merge pull request #33 from 0xBcamp/proxy
0xwetzo Feb 11, 2024
9f72614
Added Moon wallet (first steps)
perfectride Feb 13, 2024
ebed4f8
Shortened address
perfectride Feb 14, 2024
bf94d39
Added list-moon
perfectride Feb 14, 2024
4a2500b
Fusion with api
perfectride Feb 14, 2024
cf9efdc
Updated list pages
perfectride Feb 14, 2024
bd70f2d
Solve authentication issue
perfectride Feb 15, 2024
407c885
Read with wagmi
perfectride Feb 15, 2024
ef162c8
Added moon to tournament page
perfectride Feb 15, 2024
d7fac67
Added moon to enter page
perfectride Feb 15, 2024
bac8caa
Simplified moon page
perfectride Feb 15, 2024
c8f6fb1
Simplified moon page
perfectride Feb 15, 2024
a3a0dca
Improved sign page
perfectride Feb 16, 2024
3c290f1
Added copy address on sign page
perfectride Feb 16, 2024
16d79f5
PWD input
perfectride Feb 17, 2024
a49eca1
Mumbai ready
perfectride Feb 17, 2024
d3facb5
Play with Moon implemented
perfectride Feb 17, 2024
c398fd3
Play with Moon implemented
perfectride Feb 17, 2024
f33944b
Contract call fixed
perfectride Feb 17, 2024
34e1069
Deployed
perfectride Feb 17, 2024
fe4393a
Minor fixes
perfectride Feb 17, 2024
4985edb
Merge pull request #34 from 0xBcamp/mumbai
0xwetzo Feb 17, 2024
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "packages/hardhat/lib/forge-std"]
path = packages/hardhat/lib/forge-std
url = https://github.com/foundry-rs/forge-std
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@
},
"packageManager": "yarn@3.2.3",
"devDependencies": {
"hardhat-foundry": "^0.0.5",
"husky": "^8.0.1",
"lint-staged": "^13.0.3"
},
"resolutions": {
"usehooks-ts@^2.7.2": "patch:usehooks-ts@npm:^2.7.2#./.yarn/patches/usehooks-ts-npm-2.7.2-fceffe0e43.patch"
},
"dependencies": {
"@moonup/moon-rainbowkit": "^0.0.26",
"@moonup/moon-sdk": "^0.0.43"
}
}
4 changes: 4 additions & 0 deletions packages/hardhat/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ artifacts
artifacts-zk
cache-zk

#Foundry files
out
cache_forge

deployments/localhost
32 changes: 32 additions & 0 deletions packages/hardhat/NOTES-TF.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## 12/27
Play functions work
- deploy mocks to run locally
Can't seem to grab the subscriptionId properly, might not be creating one - might not be emitting event properly so can't grab, not sure what is going on
- encrypt play choices
- add more getters


### Gameplay
Rock (0) beats Scissors (2):

Player chooses Rock (0), VRFCoordinator chooses Scissors (2).
(0 + 1) % 3 = 1. Since 1 is not equal to 2, the player wins.
Scissors (2) beats Paper (1):

Player chooses Scissors (2), VRFCoordinator chooses Paper (1).
(2 + 1) % 3 = 0. Since 0 is not equal to 1, the player wins.
Paper (1) beats Rock (0):

Player chooses Paper (1), VRFCoordinator chooses Rock (0).
(1 + 1) % 3 = 2. Since 2 is not equal to 0, the player wins.
In each of these cases, the player's move plus one, modulo three, gives a result that is not equal to the VRFCoordinator's move, indicating the player's win.

However, if the VRFCoordinator's move matches this calculation, it means the player loses. For example:

Player chooses Rock (0), VRFCoordinator chooses Paper (1).
(0 + 1) % 3 = 1. Since 1 is equal to 1, the player loses.
This logic is a compact way to determine the outcome of a rock-paper-scissors game without using multiple if-else conditions. The modulo operation ensures that the result cycles through the three possible moves.

## 1/30
Yearn Notes:
Once a user's liquidity is withdrawn from the yVault, their yVault Token will be burned. yVault Tokens are ERC20, meaning they can be transferred and traded as any other common Ethereum token.
335 changes: 0 additions & 335 deletions packages/hardhat/contracts/DeFiConquest.txt

This file was deleted.

Loading
Loading