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

Feature/server #39

Merged
merged 39 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6bcee87
hack: deploy the test game for the marketting team
rsproule Oct 23, 2023
2dc6529
feat: page specific to a game
rsproule Oct 23, 2023
d2ba2ea
fix: pass address to default page
rsproule Oct 24, 2023
7895f67
wip: deploy for test
rsproule Oct 24, 2023
1045057
rm shit
rsproule Oct 24, 2023
828c3ba
gen
rsproule Oct 24, 2023
a9c7cac
names
rsproule Oct 24, 2023
04b6a87
names2
rsproule Oct 24, 2023
80b1e1b
feat: put the view stuff in the main contract to avoid annoying mapping
rsproule Oct 24, 2023
ae6f47d
feat: parameterize the game address in url
rsproule Oct 24, 2023
c9089b7
fix: clean up bun
rsproule Oct 24, 2023
178b531
fix: fully switch to bun
rsproule Oct 24, 2023
2a81c72
feat: factory deployer script
rsproule Oct 24, 2023
273a273
chore: formatting
rsproule Oct 24, 2023
8a0c5c3
feat: bring back the factory
rsproule Oct 24, 2023
34011e3
refactor: major refactor in order to support having cloned contracts
rsproule Oct 24, 2023
4934317
refactor: support for multiple games in the ui. hooks not hooked up
rsproule Oct 25, 2023
e9d1895
bug: did not handle the endgame for 2 players correctly
rsproule Oct 25, 2023
17cfc39
feat: the create game has a form now
rsproule Oct 25, 2023
d9925e7
fix: tests to handle new rules in game creation
rsproule Oct 25, 2023
f6b6f37
fix: handle overflowing fields in game list
rsproule Oct 26, 2023
4aed4eb
fix: error handling in the create game form
rsproule Oct 26, 2023
6c72ba1
fix: treaty support for multi game in frontend
rsproule Oct 26, 2023
96bcf67
feat: update the main page to only display the manifesto and a button…
rsproule Nov 29, 2023
d9ca8f3
feat: default hooks in the deployer (wip)
rsproule Nov 30, 2023
7a71f1d
fmt: nvim keeps fucking up my forge fmt
rsproule Nov 30, 2023
ad2d157
fix: the treaty stuff in factory mode was broken
rsproule Dec 5, 2023
9d9b4af
feat: move to dynamic name resolution system
rsproule Dec 6, 2023
08d8958
feat: frontend prod to point at new contracts
rsproule Jan 1, 2024
cb9827d
nit: play button on top
rsproule Jan 1, 2024
e021e9b
feat: style create game button
rsproule Jan 1, 2024
33b5276
fix: await the log text promise
rsproule Jan 1, 2024
b47c922
fix: await the log text promise
rsproule Jan 1, 2024
2fd5f61
Merge pull request #38 from rsproule/feature/game-admin
rsproule Jan 1, 2024
50cd96c
Merge branch 'master' into feature/server
rsproule Jan 1, 2024
4c33142
fix: update generated
rsproule Jan 1, 2024
3e6ec00
nit: forge fmt
rsproule Jan 2, 2024
03f8cdd
nit: forge warnings
rsproule Jan 2, 2024
06b41af
feat: github actions build via-ir
rsproule Jan 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
cd contracts
forge --version
forge build --sizes
forge build --via-ir --sizes
id: build

- name: Run Forge tests
Expand Down
8 changes: 7 additions & 1 deletion contracts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ build:; forge build

deploy-anvil:;
forge script script/TankGameDeployer.s.sol:TankGameDeployerScript --rpc-url http://localhost:8545 \
--private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast
--private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --via-ir --broadcast

fill-game:;
forge script script/FillGame.s.sol:FillGameScript --rpc-url http://localhost:8545 --broadcast \
--private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80

deploy-factory:;
forge script script/00_DeployGameImpl.s.sol --rpc-url http://localhost:8545 --private-key \
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --via-ir --broadcast
forge script script/01_DeployFactories.s.sol --rpc-url http://localhost:8545 --private-key \
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --via-ir --broadcast

Large diffs are not rendered by default.

2,003 changes: 2,003 additions & 0 deletions contracts/broadcast/DeployTankGameCustomTemp.s.sol/5/run-1698109995.json

Large diffs are not rendered by default.

2,003 changes: 2,003 additions & 0 deletions contracts/broadcast/DeployTankGameCustomTemp.s.sol/5/run-1698110089.json

Large diffs are not rendered by default.

2,003 changes: 2,003 additions & 0 deletions contracts/broadcast/DeployTankGameCustomTemp.s.sol/5/run-latest.json

Large diffs are not rendered by default.

Binary file added contracts/bun.lockb
Binary file not shown.
Loading