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

Rc 1 #1851

Merged
merged 375 commits into from
Nov 4, 2024
Merged

Rc 1 #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
375 commits
Select commit Hold shift + click to select a range
7ed275b
merge
ponderingdemocritus Oct 23, 2024
d4b459c
Enh/merge troops capacity check (#1873)
bob0005 Oct 23, 2024
fd88f3c
[config + contract] battle time limit (#1900)
credence0x Oct 23, 2024
3586373
contracts: fix test
credence0x Oct 24, 2024
aa55533
fix scripts for linux, add torii config for erc indexing
RedBeardEth Oct 24, 2024
57688d2
add realm and season mint functions to sdk
RedBeardEth Oct 24, 2024
37f544c
various landing components for mint realm
RedBeardEth Oct 24, 2024
02461f5
Merge branch 'feat/landing' of https://github.com/BibliothecaDAO/eter…
ponderingdemocritus Oct 24, 2024
dfaf38c
codegen
ponderingdemocritus Oct 24, 2024
8b5d625
exports
ponderingdemocritus Oct 24, 2024
d67ca2d
fix overwrite
ponderingdemocritus Oct 24, 2024
30555a9
delete remove data
ponderingdemocritus Oct 24, 2024
8c3dafc
basic realm minting
RedBeardEth Oct 24, 2024
b03ef6f
working realm selection
RedBeardEth Oct 24, 2024
26a81c9
add season pass mint functionality
RedBeardEth Oct 24, 2024
341574f
[client] improve entity details show/hide (#1898)
aymericdelab Oct 24, 2024
b15ac4c
add more LP stats (#1895)
aymericdelab Oct 24, 2024
0decb19
contracts: allow season pass mint to any address (#1901)
credence0x Oct 24, 2024
16fef7f
strip unusued dojo components
RedBeardEth Oct 24, 2024
434956a
bump dojo
ponderingdemocritus Oct 24, 2024
9e6aba5
deployments scripts and setup
ponderingdemocritus Oct 25, 2024
9f4fce9
Merge branch 'rc-1' into feat/landing
ponderingdemocritus Oct 25, 2024
7951044
fix
ponderingdemocritus Oct 25, 2024
78e365c
update dojo
ponderingdemocritus Oct 25, 2024
2a25fc8
add season pass mint dialog
RedBeardEth Oct 25, 2024
f1f875d
fix torii issue
ponderingdemocritus Oct 25, 2024
23be36d
Merge branch 'feat/landing' of https://github.com/BibliothecaDAO/eter…
ponderingdemocritus Oct 25, 2024
1d429c4
prettier
ponderingdemocritus Oct 25, 2024
680539a
new donkey event + improve event stream (#1904)
aymericdelab Oct 25, 2024
ecae590
feat: simulate raid (#1905)
edisontim Oct 25, 2024
2310a62
Add deposit all button + new transfer after previous one
edisontim Oct 25, 2024
dab5e2b
Merge pull request #1910 from BibliothecaDAO/feat/deposit-all
ponderingdemocritus Oct 26, 2024
1b2960b
deplouyment work
ponderingdemocritus Oct 27, 2024
4f4c1a0
merge
ponderingdemocritus Oct 27, 2024
003ac93
pwa work
ponderingdemocritus Oct 27, 2024
aa87c34
fix season pass mint, various ux
RedBeardEth Oct 28, 2024
f32cc95
[client] show more context in the market modal (#1909)
aymericdelab Oct 28, 2024
e30fdc1
contracts: split combat contracts
credence0x Oct 29, 2024
c6f15ba
Revert "contracts: split combat contracts"
credence0x Oct 29, 2024
a34984b
Fix/contract compilation size issue (#1914)
credence0x Oct 29, 2024
e138a98
balancing
ponderingdemocritus Oct 29, 2024
db9998c
Merge branch 'feat/landing' of https://github.com/BibliothecaDAO/eter…
ponderingdemocritus Oct 29, 2024
8baa182
[client] graphics update (#1912)
r0man1337 Oct 29, 2024
8309a9b
feat: add battle simulation window (#1911)
edisontim Oct 29, 2024
c1e4d12
fix fps drop (#1918)
edisontim Oct 30, 2024
276aa0a
personal event stream (#1921)
aymericdelab Oct 30, 2024
c5a873f
[client] default hex (#1922)
aymericdelab Oct 30, 2024
55b5807
[client] left navigation menu issue on small screens (#1923)
aymericdelab Oct 30, 2024
003d70f
add cartridge
RedBeardEth Oct 31, 2024
ada1944
better realm minting experience
RedBeardEth Oct 31, 2024
359e1c8
fix season pass minted logic and build errors
RedBeardEth Oct 31, 2024
0472626
add landing build script
RedBeardEth Oct 31, 2024
ac1ee24
add top level await plugin
RedBeardEth Oct 31, 2024
63d8757
change from burner to controller
RedBeardEth Oct 31, 2024
b86500b
add mkcert, update starknet provider rpc
RedBeardEth Oct 31, 2024
c81f5e1
revert tsconfig downgrade
RedBeardEth Oct 31, 2024
757dea6
client
ponderingdemocritus Oct 31, 2024
6fa946b
Merge branch 'feat/landing' of https://github.com/BibliothecaDAO/eter…
ponderingdemocritus Oct 31, 2024
f260a49
fix cartridge connector
RedBeardEth Oct 31, 2024
a702529
Merge branch 'feat/landing' of https://github.com/BibliothecaDAO/eter…
ponderingdemocritus Oct 31, 2024
9d52288
controller
ponderingdemocritus Oct 31, 2024
023c067
[client] display new weight type for troops in documentation (#1925)
aymericdelab Oct 31, 2024
b85a25f
feat: new models, bug fixes
r0man1337 Oct 31, 2024
406b8a3
feat: animated instanced models support
r0man1337 Oct 31, 2024
8cbdb57
fix: biomes models
r0man1337 Oct 31, 2024
d3fb7ec
contracts: migration wip
credence0x Oct 31, 2024
e3ff5d7
contracts: migration wip
credence0x Oct 31, 2024
e470d21
[client] make UI mobile friendly
aymericdelab Oct 31, 2024
cd75fda
contracts: migration wip
credence0x Oct 31, 2024
c13cd08
contracts: migration wip
credence0x Oct 31, 2024
e9cb7a9
contracts: migration wip
credence0x Oct 31, 2024
f3ef035
contracts: migration: add historical label to events
credence0x Oct 31, 2024
2486827
contracts: migration: update config and client
credence0x Oct 31, 2024
a2d9695
contracts: migration: bug fix and scarb fmt
credence0x Oct 31, 2024
8ec19e7
contracts: migration: update manifests
credence0x Oct 31, 2024
c667dec
contracts: migration: update manifests
credence0x Oct 31, 2024
b453596
contracts: migration: update manifests
credence0x Oct 31, 2024
932c950
add login flow to season pass mint
RedBeardEth Nov 1, 2024
928b171
Merge pull request #1930 from BibliothecaDAO/dojo-1.0.0-rc.0
ponderingdemocritus Nov 1, 2024
ba0494b
merge
ponderingdemocritus Nov 1, 2024
eb2b859
merge
ponderingdemocritus Nov 1, 2024
e31afc0
merge'
ponderingdemocritus Nov 1, 2024
59cddd4
Merge pull request #1879 from BibliothecaDAO/feat/landing
ponderingdemocritus Nov 1, 2024
963476d
merge issue
ponderingdemocritus Nov 1, 2024
fb1e3db
deployments
ponderingdemocritus Nov 1, 2024
4c7f964
fix real contracts
ponderingdemocritus Nov 1, 2024
6de7390
add back torii config for ERC indexing
RedBeardEth Nov 1, 2024
5dc3bc0
config: update .env.production
credence0x Nov 1, 2024
9dbc41f
config: update deploy.sh
credence0x Nov 1, 2024
95f5490
feat: add sounds (#1926)
edisontim Nov 1, 2024
22449f4
pwa
ponderingdemocritus Nov 1, 2024
7833d38
fix account
ponderingdemocritus Nov 1, 2024
d005d7d
continue mobile UI
aymericdelab Nov 1, 2024
0cc2229
icons
ponderingdemocritus Nov 1, 2024
8248678
Refactor left navigation menu and storehouse tooltip in TopLeftNaviga…
aymericdelab Nov 1, 2024
0e1332b
Refactor WorldmapScene to conditionally create and show/hide the mini…
aymericdelab Nov 1, 2024
074124e
improve mobile xp
aymericdelab Nov 1, 2024
5f6a2c0
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
aymericdelab Nov 1, 2024
e8a568d
build issue
aymericdelab Nov 1, 2024
822ad1f
prettier
aymericdelab Nov 1, 2024
1ba99ae
prettier
aymericdelab Nov 1, 2024
325b8be
knip ignore
aymericdelab Nov 1, 2024
6f632ba
Merge pull request #1931 from BibliothecaDAO/raschel/issue1929
ponderingdemocritus Nov 1, 2024
dfd5c5f
Impl. production buildings list
bob0005 Nov 2, 2024
2c80369
Merge branch 'rc-1' into enh/buildings-list
bob0005 Nov 2, 2024
df7697d
fix account issue on movement
ponderingdemocritus Nov 2, 2024
dca104d
Fix tests dojov1.0.0-rc.0 (#1936)
credence0x Nov 2, 2024
6685c57
fix account
ponderingdemocritus Nov 3, 2024
51a1802
account
ponderingdemocritus Nov 3, 2024
57edcbf
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 3, 2024
1e94beb
feat: new bank model, types refactor
r0man1337 Nov 3, 2024
a6d95ec
polishing
ponderingdemocritus Nov 3, 2024
71d3639
feat: new models
r0man1337 Nov 3, 2024
ef27bff
fix: git attributes hdr
r0man1337 Nov 3, 2024
b11dec3
feat: new environment, lights
r0man1337 Nov 3, 2024
60bbf41
Merge pull request #1935 from BibliothecaDAO/enh/buildings-list
ponderingdemocritus Nov 3, 2024
75b16fe
feat: rotation fixes
r0man1337 Nov 3, 2024
205b141
fix: ground mesh metalness
r0man1337 Nov 3, 2024
a7b5c14
fix: hdr texture optimization
r0man1337 Nov 3, 2024
018d7f8
feat: forge resources colors
r0man1337 Nov 3, 2024
e9f0700
cleanups
ponderingdemocritus Nov 3, 2024
716f745
account
ponderingdemocritus Nov 3, 2024
2834f08
account context
ponderingdemocritus Nov 3, 2024
7b451f5
log
ponderingdemocritus Nov 3, 2024
3327118
feat: models
r0man1337 Nov 3, 2024
1fcc5de
Merge branch 'rc-1' into feat/leet
r0man1337 Nov 3, 2024
5872a6e
contracts: add stamina refill config
credence0x Nov 3, 2024
6f771ef
contracts: remove warning during season pass compilation
credence0x Nov 3, 2024
dcfb369
contracts: update manifest
credence0x Nov 3, 2024
3f1549f
contracts: fix sub overflow in pillage
credence0x Nov 3, 2024
366dc55
fix loading
ponderingdemocritus Nov 3, 2024
77490fa
lint
ponderingdemocritus Nov 3, 2024
b49927b
fix dojo_dev.toml
credence0x Nov 3, 2024
8fd2093
contracts: scarb fmt
credence0x Nov 3, 2024
61f98f2
🏆 Integrate controller achievements (#1933)
bal7hazar Nov 3, 2024
e526ce5
Remove test
ponderingdemocritus Nov 3, 2024
8ac82fb
Merge pull request #1943 from BibliothecaDAO/feat/leet
ponderingdemocritus Nov 3, 2024
d87355e
fix local deploy issues
aymericdelab Nov 3, 2024
c654835
Merge pull request #1948 from BibliothecaDAO/fix-local
ponderingdemocritus Nov 3, 2024
9f6db40
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
82e89c5
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
17403a0
account owrk
ponderingdemocritus Nov 3, 2024
e6c9b45
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 3, 2024
0c78279
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
258e8c9
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
d5ed29f
fix
ponderingdemocritus Nov 3, 2024
009e1ea
Bob/dev (#1927)
bob0005 Nov 3, 2024
3893817
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
83ad711
bump version (#1949)
bob0005 Nov 3, 2024
2fd4dce
accounts
ponderingdemocritus Nov 3, 2024
83c4c02
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 3, 2024
7bd5b26
prettier
credence0x Nov 3, 2024
81c777e
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
23b011a
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
63ca259
contracts: fix tests
credence0x Nov 3, 2024
8e48a21
contracts: fix resource bridge tests (#1950)
credence0x Nov 3, 2024
662ed39
client: fix knip
credence0x Nov 3, 2024
c95a216
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
e41a1d2
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
8cede70
client: revert fix knip
credence0x Nov 3, 2024
e0c6189
client: revert fix knip
credence0x Nov 3, 2024
1904495
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
2f40afc
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
d527a64
contracts: register new events in test
credence0x Nov 3, 2024
d63d298
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
5109861
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
credence0x Nov 3, 2024
ee9e868
change guild into tribe
aymericdelab Nov 3, 2024
523bb99
Merge pull request #1944 from BibliothecaDAO/fix-pillage
ponderingdemocritus Nov 3, 2024
2b2cfcc
Merge pull request #1945 from BibliothecaDAO/stamina-config
ponderingdemocritus Nov 3, 2024
c40fd9d
deployment work
ponderingdemocritus Nov 3, 2024
5a4272b
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 3, 2024
a505a7c
new audio army select
aymericdelab Nov 4, 2024
80b1a2b
format text action info
aymericdelab Nov 4, 2024
78b962f
fix key down propagation
aymericdelab Nov 4, 2024
8abf12d
fix build
aymericdelab Nov 4, 2024
6016c5a
deployment update
ponderingdemocritus Nov 4, 2024
a3501e4
policies
ponderingdemocritus Nov 4, 2024
91ec567
fix
ponderingdemocritus Nov 4, 2024
bd0fefd
revert config
ponderingdemocritus Nov 4, 2024
a2f561a
make stamina 2
ponderingdemocritus Nov 4, 2024
4074074
improve loading flow
ponderingdemocritus Nov 4, 2024
284dfbb
guilds
ponderingdemocritus Nov 4, 2024
3dd4130
market
ponderingdemocritus Nov 4, 2024
1c08457
feat: fragment mine color
r0man1337 Nov 4, 2024
ba6a127
fix path
ponderingdemocritus Nov 4, 2024
d2882c9
add ui and graphql for realm mints
RedBeardEth Nov 4, 2024
a770f1b
Merge pull request #1954 from BibliothecaDAO/army-sound
ponderingdemocritus Nov 4, 2024
17e94db
merge
ponderingdemocritus Nov 4, 2024
78db91e
Merge pull request #1953 from BibliothecaDAO/fix/tribe
ponderingdemocritus Nov 4, 2024
e27460a
fix: error when open fragment mine hexception
r0man1337 Nov 4, 2024
ab4fbaf
prettier
ponderingdemocritus Nov 4, 2024
91425f7
fix: fragment mine hexception model
r0man1337 Nov 4, 2024
e4c3327
fix: #1887
r0man1337 Nov 4, 2024
773908d
introduce hook
ponderingdemocritus Nov 4, 2024
c0527f7
feat: reflect castle level on map
r0man1337 Nov 4, 2024
f2ff3c4
diff
ponderingdemocritus Nov 4, 2024
dbcb4b0
realm settle
ponderingdemocritus Nov 4, 2024
086721e
scarb
ponderingdemocritus Nov 4, 2024
051bc65
knip
ponderingdemocritus Nov 4, 2024
d1f00ca
fix: prettier
r0man1337 Nov 4, 2024
7d527a2
comment out for knip not sure why @tedison
ponderingdemocritus Nov 4, 2024
4da1f66
battle blah blah
ponderingdemocritus Nov 4, 2024
4d7fdf7
tests
ponderingdemocritus Nov 4, 2024
8a2cc87
fix: refactor minimap
r0man1337 Nov 4, 2024
6660583
Merge pull request #1962 from BibliothecaDAO/feat/realm-select
ponderingdemocritus Nov 4, 2024
cd391e2
feat: zoom to cursor
r0man1337 Nov 4, 2024
74454f1
Merge pull request #1964 from BibliothecaDAO/leet/dev
ponderingdemocritus Nov 4, 2024
bf0f35d
feat: new stable model
r0man1337 Nov 4, 2024
add877d
fix: stable rotation
r0man1337 Nov 4, 2024
d005dc2
increase realms limit
ponderingdemocritus Nov 4, 2024
523c2ae
🐛 Fix strategist achievement order
bal7hazar Nov 4, 2024
38e703e
fix broken paths
ponderingdemocritus Nov 4, 2024
79afdf2
feat: expandable minimap
r0man1337 Nov 4, 2024
8f1160b
feat: minimap labels
r0man1337 Nov 4, 2024
76e9fb3
feat: battles for minimap
r0man1337 Nov 4, 2024
f3656b9
feat: minimap battles
r0man1337 Nov 4, 2024
05b0d80
fix: removed minimap legend
r0man1337 Nov 4, 2024
a3254b6
fix: prettier
r0man1337 Nov 4, 2024
a15c3ca
remove soldier scream sound
aymericdelab Nov 4, 2024
d7f9eb9
Fix icons + styling
bob0005 Nov 4, 2024
4ee6227
lint
bob0005 Nov 4, 2024
5310fc9
resource chip
ponderingdemocritus Nov 4, 2024
c40b852
Merge pull request #1965 from bal7hazar/fix(trophies)/strategist
ponderingdemocritus Nov 4, 2024
b892b31
Merge pull request #1967 from BibliothecaDAO/leet/dev2
ponderingdemocritus Nov 4, 2024
859802c
formatting
ponderingdemocritus Nov 4, 2024
5665eb0
Merge pull request #1969 from BibliothecaDAO/loaf/edit
ponderingdemocritus Nov 4, 2024
8c37e8a
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 4, 2024
3a98461
remove comment + typing
bob0005 Nov 4, 2024
891e09a
Merge pull request #1968 from BibliothecaDAO/fix/social
ponderingdemocritus Nov 4, 2024
446933f
onboarding
ponderingdemocritus Nov 4, 2024
0845541
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 4, 2024
579efe7
resource chip optimisation
ponderingdemocritus Nov 4, 2024
80376c5
Enable social before finishing quests
bob0005 Nov 4, 2024
b8803f5
Merge pull request #1970 from BibliothecaDAO/fix/allow-social
ponderingdemocritus Nov 4, 2024
957c5f2
contracts: update tool-versions
credence0x Nov 4, 2024
4f92f84
contracts: fix guild events
credence0x Nov 4, 2024
2f8dda6
add loading entitie
ponderingdemocritus Nov 4, 2024
7212a73
Merge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Nov 4, 2024
3ddbf7f
Fix quest update on optimitic build
bob0005 Nov 4, 2024
6f6c17a
Merge pull request #1971 from BibliothecaDAO/fix/quest-update
ponderingdemocritus Nov 4, 2024
cd9b9d2
fix resource arrivals
aymericdelab Nov 4, 2024
c88ee86
deploy
ponderingdemocritus Nov 4, 2024
c115ba7
erge branch 'rc-1' of https://github.com/BibliothecaDAO/eternum into …
ponderingdemocritus Nov 4, 2024
2cf90eb
policies
ponderingdemocritus Nov 4, 2024
e4fe14f
merge
ponderingdemocritus Nov 4, 2024
ff15188
click hex selection
aymericdelab Nov 4, 2024
841183d
prettier
ponderingdemocritus Nov 4, 2024
405a1d9
fix army sound
aymericdelab Nov 4, 2024
8314257
onboarding
ponderingdemocritus Nov 4, 2024
0683274
Merge pull request #1972 from BibliothecaDAO/raschel/dev
ponderingdemocritus Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 4 additions & 3 deletions .github/workflows/test-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,18 @@ jobs:
hyperstructure_test,
bank_test,
map_test,
resources_test,
resource_bridge_test,
trade_test,
realm_test,
guild_test,
transport_test,
test_ownership_systems,
Comment on lines +42 to +47
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Test matrix entries don't match actual test file names

The workflow's test matrix entries don't correspond to the actual test file structure in the repository. The test files are organized as:

  • contracts/src/systems/resources/tests/resource_bridge_system_tests.cairo
  • contracts/src/systems/trade/tests/trade_systems_tests.cairo
  • contracts/src/systems/realm/tests.cairo
  • contracts/src/systems/guild/tests.cairo
  • contracts/src/systems/transport/tests/travel_systems_tests.cairo
  • contracts/src/systems/ownership/tests.cairo

The matrix entries should be updated to match these actual file names and paths.

🔗 Analysis chain

Maintain consistent test naming conventions.

The test name test_ownership_systems doesn't follow the *_test naming pattern used by other tests in the matrix.

Consider renaming to ownership_systems_test for consistency.

Let's verify the test files exist and follow naming conventions:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify test files and naming patterns
echo "Checking test files in contracts directory..."
fd -e cairo "test" contracts/tests/

Length of output: 279


Script:

#!/bin/bash
# Let's try searching in the root directory and common test locations
echo "Searching for test files in repository..."
fd -t f -e cairo test

# Also check for specific test files mentioned in the workflow
echo -e "\nChecking for specific test files..."
for test in "resource_bridge_test" "trade_test" "realm_test" "guild_test" "transport_test" "test_ownership_systems"; do
    echo "Looking for $test:"
    fd -t f "$test" 
done

Length of output: 2824

]
fail-fast: false
steps:
- name: Download Dojo release artifact
run: |
curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v1.0.0-alpha.12/dojo_v1.0.0-alpha.12_linux_amd64.tar.gz
curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v1.0.0-rc.1/dojo_v1.0.0-rc.1_linux_amd64.tar.gz
tar -xzf dojo-linux-x86_64.tar.gz
sudo mv sozo /usr/local/bin/
- name: Checkout repository
Expand All @@ -68,5 +69,5 @@ jobs:
- uses: actions/checkout@v3
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.7.0"
scarb-version: "2.8.4"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Version requirements are partially documented but need improvement

The README.md mentions Dojo version 0.7.3, but this appears outdated since the Scarb.toml shows newer versions:

  • Cairo version: 2.8.4
  • Dojo version: v1.0.0-rc.0

The version requirements should be updated in the README to match the current dependencies.

  • Update README.md's "Setup" section to reflect:
    • Current Cairo version (2.8.4)
    • Current Dojo version (v1.0.0-rc.0)
🔗 Analysis chain

Document version requirements

The workflow updates Scarb from 2.7.0 to 2.8.4. Consider documenting these version requirements in a central location (e.g., README.md) to help developers set up their environment correctly.

Let's check if version requirements are documented:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for version documentation

# Test: Look for version documentation in common locations
echo "Checking for version documentation..."
rg -l "scarb.*version|dojo.*version" --type md

Length of output: 403


Script:

#!/bin/bash
# Let's check README and other documentation files more broadly
echo "Checking documentation files..."
fd -e md -X cat {}

# Also check Scarb.toml for version specifications
echo -e "\nChecking Scarb.toml..."
fd Scarb.toml -X cat {}

Length of output: 15882

- run: cd contracts && scarb fmt --check
31 changes: 31 additions & 0 deletions .github/workflows/test-season-pass.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: test season pass

on:
pull_request:
paths-ignore:
- "contracts/**"
- "client/**"
- "**/manifest.json"
- "discord-bot/**"
- "config/**"
- ".github/**"
- "pnpm-lock.yaml"

env:
SCARB_VERSION: v2.8.2
Comment on lines +14 to +15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider using the SCARB_VERSION environment variable.

The SCARB_VERSION environment variable is defined but not explicitly used in the workflow steps. To ensure consistency and make version updates easier, consider using this variable in the setup steps.

Update the Scarb setup step to use the environment variable:

 - uses: software-mansion/setup-scarb@v1
   with:
+    scarb-version: ${{ env.SCARB_VERSION }}
     tool-versions: season_pass/contracts/.tool-versions
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
env:
SCARB_VERSION: v2.8.2
env:
SCARB_VERSION: v2.8.2
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: ${{ env.SCARB_VERSION }}
tool-versions: season_pass/contracts/.tool-versions


jobs:
test-season-pass:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: software-mansion/setup-scarb@v1
with:
tool-versions: season_pass/contracts/.tool-versions
- uses: foundry-rs/setup-snfoundry@v3
with:
tool-versions: season_pass/contracts/.tool-versions
Comment on lines +17 to +27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

🛠️ Refactor suggestion

Update actions and pin the Ubuntu version.

The current workflow uses actions/checkout@v3 and runs on ubuntu-latest. To ensure compatibility and consistency, consider the following improvements:

  1. Update actions/checkout to the latest version:

    - uses: actions/checkout@v3
    + uses: actions/checkout@v4
  2. Pin the Ubuntu version to ensure build consistency:

    - runs-on: ubuntu-latest
    + runs-on: ubuntu-22.04
🔗 Analysis chain

Consider updating actions and pinning the Ubuntu version.

The job setup looks good overall, but there are a few suggestions for improvement:

  1. Update the checkout action to the latest version:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  1. Consider pinning the Ubuntu version to ensure consistency:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
  1. Verify that the .tool-versions file exists and contains the correct versions:
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence and content of the .tool-versions file

# Test: Check if the file exists and display its content
if [ -f "season_pass/contracts/.tool-versions" ]; then
    echo "Content of .tool-versions file:"
    cat "season_pass/contracts/.tool-versions"
else
    echo "Error: .tool-versions file not found"
    exit 1
fi

Length of output: 201


Script:

#!/bin/bash
# Description: Check the version of actions/checkout in the workflow file

# Use grep to find the actions/checkout version
echo "Checking actions/checkout version:"
grep 'uses: actions/checkout@' .github/workflows/test-season-pass.yml || { echo "actions/checkout not found"; exit 1; }

Length of output: 184


Script:

#!/bin/bash
# Description: Verify if the Ubuntu version is pinned in the workflow file

# Check if runs-on is set to ubuntu-latest
echo "Checking runs-on configuration:"
if grep -q 'runs-on: ubuntu-latest' .github/workflows/test-season-pass.yml; then
    echo "runs-on is set to ubuntu-latest. Consider pinning to a specific version like ubuntu-22.04."
    exit 1
else
    echo "runs-on is pinned to a specific Ubuntu version."
fi

Length of output: 346

- run: scarb build
working-directory: season_pass/contracts
- run: snforge test
working-directory: season_pass/contracts
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
node_modules
target
.snfoundry_cache
4 changes: 3 additions & 1 deletion .knip.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

"client/src/three/components/FogManager.ts",
"client/src/hooks/useUISound.tsx",
"balancing/**"
"balancing/**",
"landing/**",
"client/pwa-assets.config.ts"
]
}
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
scarb 2.7.0
dojo 1.0.0-alpha.12
scarb 2.8.4
dojo 1.0.0-rc.1
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
}
},
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
2 changes: 1 addition & 1 deletion balancing/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ResourceTable } from "./components/modules/resource-table";
function App() {
return (
<>
<div className="bg-black text-white">
<div className="bg-brown text-white">
<Tabs defaultValue="account">
<TabsList>
<TabsTrigger value="resources">Production</TabsTrigger>
Expand Down
7 changes: 3 additions & 4 deletions balancing/src/components/modules/resource-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {
};

const getResourceWeight = (id: number) => {
return WEIGHTS_GRAM[id] || 0;
return WEIGHTS_GRAM[id as keyof typeof WEIGHTS_GRAM] || 0;
};

const getResourceTier = (id: number) => {
Expand All @@ -43,7 +43,7 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {

// New function to calculate adjusted resource inputs based on rarity
const getAdjustedResourceInputs = (resourceId: number) => {
const multiplier = RESOURCE_RARITY[resourceId] || 1; // Default multiplier is 1
const multiplier = RESOURCE_RARITY[resourceId as keyof typeof RESOURCE_RARITY] || 1; // Default multiplier is 1

return (
RESOURCE_INPUTS_SCALED[resourceId]?.map((input) => ({
Expand All @@ -61,14 +61,13 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {
const buildingUsageCount = Object.values(BUILDING_COSTS_SCALED).reduce((count, costs) => {
return count + costs.filter((cost: any) => cost.resource === resource.id).length;
}, 0);

acc[resource.id] = inputUsageCount + buildingUsageCount;
return acc;
},
{} as Record<number, number>,
);

console.log(resourceUsageCount);

// Function to sum adjusted inputs
const sumAdjustedInputs = (resourceId: number) => {
const adjustedInputs = getAdjustedResourceInputs(resourceId);
Expand Down
2 changes: 1 addition & 1 deletion balancing/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
@layer base {
* {
@apply border-border;
@apply border-border bg-black;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Reconsider applying black background to all elements.

Adding bg-black to the universal selector (*) could cause several issues:

  1. It overrides the theme system's background colors defined in :root and .dark
  2. It breaks component transparency where needed
  3. It might interfere with proper dark/light mode switching

Consider one of these alternatives:

- * {
-   @apply border-border bg-black;
- }
+ * {
+   @apply border-border;
+ }

Or if a dark background is specifically needed:

- * {
-   @apply border-border bg-black;
- }
+ * {
+   @apply border-border;
+ }
+ body {
+   @apply bg-black text-foreground;
+ }

This maintains the theme system's flexibility while achieving the desired dark appearance.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
@apply border-border bg-black;
* {
@apply border-border;
}
body {
@apply bg-black text-foreground;
}

}
body {
@apply bg-background text-foreground;
Expand Down
7 changes: 6 additions & 1 deletion balancing/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,

"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
},
"include": ["src"]
}
4 changes: 2 additions & 2 deletions client/.env.preview
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VITE_PUBLIC_MASTER_ADDRESS="0x1a3e37c77be7de91a9177c6b57956faa6da25607e567b10a25cf64fea5e533b"
VITE_PUBLIC_MASTER_PRIVATE_KEY="0x4ab5a607d92f0870cfd82ef9cecb2fe903830441180fd432b831a8863c08097"
VITE_PUBLIC_WORLD_ADDRESS="0x76ca3dfc3e96843716f882546f0db96b7da0cf988bdba284b469d0defb2f48f"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"
VITE_PUBLIC_WORLD_ADDRESS="0x073bad29b5c12b09f9023e8d3a5876ea6ebd41fa26cab5035369fec4691067c2"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
VITE_EVENT_KEY="0x1a2f334228cee715f1f0f54053bb6b5eac54fa336e0bc1aacf7516decb0471d"
VITE_PUBLIC_TORII="https://api.cartridge.gg/x/eternum-42/torii"
VITE_PUBLIC_NODE_URL="https://api.cartridge.gg/x/eternum-42/katana/"
Expand Down
23 changes: 13 additions & 10 deletions client/.env.production
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
VITE_PUBLIC_MASTER_ADDRESS="0x779c2c098f066ddde5850ec8426511e46e6499adf0b5c77e8961917413b57db"
VITE_PUBLIC_MASTER_PRIVATE_KEY="0x189765c7b9daa2efdd3025d3236a929ce5e510834b8cba4f002a0d5c1accb5a"
VITE_PUBLIC_WORLD_ADDRESS="0x76ca3dfc3e96843716f882546f0db96b7da0cf988bdba284b469d0defb2f48f"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"
VITE_EVENT_KEY="0x1a2f334228cee715f1f0f54053bb6b5eac54fa336e0bc1aacf7516decb0471d"
VITE_PUBLIC_TORII="https://api.cartridge.gg/x/eternum-42/torii"
VITE_PUBLIC_NODE_URL="https://api.cartridge.gg/x/eternum-42/katana/"
VITE_PUBLIC_MASTER_ADDRESS=0x4aa20bd71961247515f78970708f260c60b308e4ae131f085a6f5a61d0f19c0
VITE_PUBLIC_MASTER_PRIVATE_KEY=0x1957b6ac5c9f80cb18995c3304e63b2a8dd33c1e058c2f014de0b4c5c788fd
VITE_PUBLIC_WORLD_ADDRESS="0x073bad29b5c12b09f9023e8d3a5876ea6ebd41fa26cab5035369fec4691067c2"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
VITE_PUBLIC_TORII=https://api.cartridge.gg/x/eternum-rc1-1/torii
VITE_PUBLIC_NODE_URL=https://api.cartridge.gg/x/eternum-rc1-1/katana
VITE_PUBLIC_DEV=false
VITE_PUBLIC_GAME_VERSION="v0.9.0"
VITE_PUBLIC_GAME_VERSION="v1.0.0-rc0"
VITE_PUBLIC_SHOW_FPS=false
VITE_PUBLIC_GRAPHICS_DEV=false
VITE_PUBLIC_TORII_RELAY="/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Feternum-42%2Ftorii%2Fwss"
VITE_PUBLIC_CONSTRUCTION_FLAG=true
VITE_PUBLIC_TORII_RELAY=/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Feternum-rc1-1%2Ftorii%2Fwss

VITE_SEASON_PASS_ADDRESS="0x4ba954b600d68b3309f0f9a6a1626389ca1a3615bdaef754e9f04b07ca0b62d"
VITE_REALMS_ADDRESS="0x6b9857a356258e95a7ad7c842ca4cc71c25e171b123256072d2abefef2e03ec"
VITE_LORDS_ADDRESS="0x4ca3786b2bbe3c9b373b19f6c5b27bc5cfa9ed169292583b126c2fd9ee27200"

12 changes: 8 additions & 4 deletions client/.env.sample
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VITE_PUBLIC_MASTER_ADDRESS="0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
VITE_PUBLIC_MASTER_PRIVATE_KEY="0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
VITE_PUBLIC_WORLD_ADDRESS="0x177a3f3d912cf4b55f0f74eccf3b7def7c6144efeba033e9f21d9cdb0230c64"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"
VITE_PUBLIC_MASTER_ADDRESS="0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec"
VITE_PUBLIC_MASTER_PRIVATE_KEY="0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912"
VITE_PUBLIC_WORLD_ADDRESS="0x073bad29b5c12b09f9023e8d3a5876ea6ebd41fa26cab5035369fec4691067c2"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
VITE_NETWORK_FEE_TOKEN="0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
VITE_EVENT_KEY="0x1a2f334228cee715f1f0f54053bb6b5eac54fa336e0bc1aacf7516decb0471d"
VITE_PUBLIC_TORII="http://localhost:8080"
Expand All @@ -12,5 +12,9 @@ VITE_PUBLIC_DEV=false
VITE_PUBLIC_SHOW_FPS=true
VITE_PUBLIC_GRAPHICS_DEV=false

VITE_SEASON_PASS_ADDRESS="0x18cd31a545b13597adeafa40979a7456aae9d12bd0b9a9879089ed051402c6c"
VITE_REALMS_ADDRESS="0x57e1cb22f5688a833ceff37d8569297877dd8fc1896e36f1a0c8b2d30b7de85"
VITE_LORDS_ADDRESS="0x5839f41cadbe12678b2e7b67bd6daa5bd54b7b19bdc835c87fe4662dbf7a93c"

# You will have to change this to your local torii. It will be in the printout.
VITE_PUBLIC_TORII_RELAY="/ip4/0.0.0.0/udp/9091/webrtc-direct/certhash/uEiAN3-ttwg-yphp9ZgqhSCGNsWLXIo0eHEsrLRUzp4SpKg"
2 changes: 1 addition & 1 deletion client/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Procfile text
*.wbmp binary
*.webp binary
*.avif binary

*.hdr binary

# Audio
*.kar binary
Expand Down
4 changes: 3 additions & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?
yarn.lock
yarn.lock

dev-dist
10 changes: 6 additions & 4 deletions client/dojoConfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createDojoConfig } from "@dojoengine/core";
import devManifest from "../contracts/manifests/dev/deployment/manifest.json";
import productionManifest from "../contracts/manifests/prod/deployment/manifest.json";
import devManifest from "../contracts/manifest_dev.json";
import productionManifest from "../contracts/manifest_prod.json";

const {
VITE_PUBLIC_NODE_URL,
Expand All @@ -15,14 +15,16 @@ const {

const manifest = VITE_PUBLIC_DEV === "true" ? devManifest : productionManifest;

console.log(productionManifest);

export const dojoConfig = createDojoConfig({
rpcUrl: VITE_PUBLIC_NODE_URL,
toriiUrl: VITE_PUBLIC_TORII,
relayUrl: VITE_PUBLIC_TORII_RELAY,
masterAddress: VITE_PUBLIC_MASTER_ADDRESS,
masterPrivateKey: VITE_PUBLIC_MASTER_PRIVATE_KEY,
accountClassHash:
VITE_PUBLIC_ACCOUNT_CLASS_HASH || "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c",
feeTokenAddress: VITE_PUBLIC_FEE_TOKEN_ADDRESS || "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
VITE_PUBLIC_ACCOUNT_CLASS_HASH || "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Inconsistent VITE_PUBLIC_ACCOUNT_CLASS_HASH value found in .github/workflows/test-client.yml.

  • The VITE_PUBLIC_ACCOUNT_CLASS_HASH is set to "0x0" in .github/workflows/test-client.yml, which does not match the updated hash used in other .env files and client/dojoConfig.ts.
🔗 Analysis chain

Verify the new account class hash across the codebase.

The accountClassHash default value has been updated. This change appears to be part of a broader update across the codebase, including modifications to .env.preview and .env.production files.

To ensure consistency and correctness, please run the following script:

Ensure that:

  1. The new hash is present in the relevant .env files.
  2. There are no remaining instances of the old hash.
  3. The VITE_PUBLIC_ACCOUNT_CLASS_HASH values in .env files match the new hash.

If any inconsistencies are found, please update the relevant files to maintain consistency across the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the new account class hash across the codebase

# Test 1: Check for the new hash in .env files
echo "Checking .env files for the new hash:"
rg "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" .env*

# Test 2: Check for any remaining instances of the old hash
echo "Checking for any remaining instances of the old hash:"
rg "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"

# Test 3: Verify VITE_PUBLIC_ACCOUNT_CLASS_HASH in .env files
echo "Verifying VITE_PUBLIC_ACCOUNT_CLASS_HASH in .env files:"
rg "VITE_PUBLIC_ACCOUNT_CLASS_HASH" .env*

Length of output: 610


Script:

#!/bin/bash
# Description: Comprehensive verification of the account class hash across the entire codebase

# Test 1: Check for the new hash in all files
echo "Checking for the new account class hash in the codebase:"
rg "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" --hidden --ignore-dir={node_modules,dist,build}

# Test 2: Check for any remaining instances of the old hash in all files
echo "Checking for any remaining instances of the old account class hash in the codebase:"
rg "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c" --hidden --ignore-dir={node_modules,dist,build}

# Test 3: Verify all instances of VITE_PUBLIC_ACCOUNT_CLASS_HASH are updated
echo "Verifying all occurrences of VITE_PUBLIC_ACCOUNT_CLASS_HASH in the codebase:"
rg "VITE_PUBLIC_ACCOUNT_CLASS_HASH" --hidden --ignore-dir={node_modules,dist,build}

Length of output: 2187


Script:

#!/bin/bash
# Description: Comprehensive verification of the account class hash across the entire codebase with corrected rg commands

# Test 1: Check for the new hash in all files
echo "Checking for the new account class hash in the codebase:"
rg "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" --hidden --ignore-dir node_modules --ignore-dir dist --ignore-dir build

# Test 2: Check for any remaining instances of the old account class hash in all files
echo "Checking for any remaining instances of the old account class hash in the codebase:"
rg "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c" --hidden --ignore-dir node_modules --ignore-dir dist --ignore-dir build

# Test 3: Verify all instances of VITE_PUBLIC_ACCOUNT_CLASS_HASH are updated
echo "Verifying all occurrences of VITE_PUBLIC_ACCOUNT_CLASS_HASH in the codebase:"
rg "VITE_PUBLIC_ACCOUNT_CLASS_HASH" --hidden --ignore-dir node_modules --ignore-dir dist --ignore-dir build

Length of output: 2187


Script:

#!/bin/bash
# Description: Comprehensive verification of the account class hash across the entire codebase using --glob to exclude directories

# Test 1: Check for the new account class hash in all files except excluded directories
echo "Checking for the new account class hash in the codebase:"
rg "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" --hidden --glob '!node_modules/**' --glob '!dist/**' --glob '!build/**'

# Test 2: Check for any remaining instances of the old account class hash in all files except excluded directories
echo "Checking for any remaining instances of the old account class hash in the codebase:"
rg "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c" --hidden --glob '!node_modules/**' --glob '!dist/**' --glob '!build/**'

# Test 3: Verify all instances of VITE_PUBLIC_ACCOUNT_CLASS_HASH are updated in all files except excluded directories
echo "Verifying all occurrences of VITE_PUBLIC_ACCOUNT_CLASS_HASH in the codebase:"
rg "VITE_PUBLIC_ACCOUNT_CLASS_HASH" --hidden --glob '!node_modules/**' --glob '!dist/**' --glob '!build/**'

Length of output: 2251

feeTokenAddress: VITE_PUBLIC_FEE_TOKEN_ADDRESS || "0x0",
manifest,
});
17 changes: 11 additions & 6 deletions client/hex/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@
<link rel="prefetch" href="/images/resources/9.png" />
<link rel="prefetch" href="/images/resources/coin.png" />
<!-- avatars -->
<link rel="prefetch" href="/images/avatars/1.png" />
<link rel="prefetch" href="/images/avatars/2.png" />
<link rel="prefetch" href="/images/avatars/3.png" />
<link rel="prefetch" href="/images/avatars/4.png" />
<link rel="prefetch" href="/images/avatars/5.png" />
<link rel="prefetch" href="/images/avatars/6.png" />
<link rel="prefetch" href="/images/avatars/01.png" />
<link rel="prefetch" href="/images/avatars/02.png" />
<link rel="prefetch" href="/images/avatars/03.png" />
<link rel="prefetch" href="/images/avatars/04.png" />
<link rel="prefetch" href="/images/avatars/05.png" />
<link rel="prefetch" href="/images/avatars/06.png" />
<link rel="prefetch" href="/images/avatars/07.png" />
<link rel="prefetch" href="/images/avatars/08.png" />
<link rel="prefetch" href="/images/avatars/09.png" />
<link rel="prefetch" href="/images/avatars/10.png" />

<!-- buildings -->
<!-- contruction -->
<link rel="prefetch" href="/images/buildings/construction/archery.png" />
Expand Down
28 changes: 22 additions & 6 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@
<link rel="prefetch" href="/images/resources/9.png" />
<link rel="prefetch" href="/images/resources/coin.png" />
<!-- avatars -->
<link rel="prefetch" href="/images/avatars/1.png" />
<link rel="prefetch" href="/images/avatars/2.png" />
<link rel="prefetch" href="/images/avatars/3.png" />
<link rel="prefetch" href="/images/avatars/4.png" />
<link rel="prefetch" href="/images/avatars/5.png" />
<link rel="prefetch" href="/images/avatars/6.png" />
<link rel="prefetch" href="/images/avatars/01.png" />
<link rel="prefetch" href="/images/avatars/02.png" />
<link rel="prefetch" href="/images/avatars/03.png" />
<link rel="prefetch" href="/images/avatars/04.png" />
<link rel="prefetch" href="/images/avatars/05.png" />
<link rel="prefetch" href="/images/avatars/06.png" />
<link rel="prefetch" href="/images/avatars/07.png" />
<link rel="prefetch" href="/images/avatars/08.png" />
<link rel="prefetch" href="/images/avatars/09.png" />
<link rel="prefetch" href="/images/avatars/10.png" />

<!-- buildings -->
<!-- contruction -->
<link rel="prefetch" href="/images/buildings/construction/archery.png" />
Expand Down Expand Up @@ -77,6 +82,17 @@
<link rel="prefetch" href="/textures/paper/worldmap-bg.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Realms: Eternum</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Remove duplicate viewport meta tag.

There's a conflicting viewport meta tag. The existing tag prevents zooming with user-scalable=no, while this new one allows it. Please remove one of them based on the intended user experience.

<meta name="description" content="The ultimate strategy game on Starknet" />
<meta property="og:title" content="Realms: Eternum" />
<meta property="og:description" content="The ultimate strategy game on Starknet" />
<meta property="og:image" content="/images/cover.png" />
<meta property="og:url" content="https://eternum.realms.world" />
<meta property="og:type" content="website" />
<link rel="icon" href="/images/favicon.ico" />
<link rel="apple-touch-icon" href="/images/apple-touch-icon-180x180.png" sizes="180x180" />
<link rel="mask-icon" href="/images/maskable-icon-512x512.png" color="#FFFFFF" />
<meta name="theme-color" content="#ffffff" />
</head>
<body>
<div id="root"></div>
Expand Down
17 changes: 11 additions & 6 deletions client/map/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@
<link rel="prefetch" href="/images/resources/9.png" />
<link rel="prefetch" href="/images/resources/coin.png" />
<!-- avatars -->
<link rel="prefetch" href="/images/avatars/1.png" />
<link rel="prefetch" href="/images/avatars/2.png" />
<link rel="prefetch" href="/images/avatars/3.png" />
<link rel="prefetch" href="/images/avatars/4.png" />
<link rel="prefetch" href="/images/avatars/5.png" />
<link rel="prefetch" href="/images/avatars/6.png" />
<link rel="prefetch" href="/images/avatars/01.png" />
<link rel="prefetch" href="/images/avatars/02.png" />
<link rel="prefetch" href="/images/avatars/03.png" />
<link rel="prefetch" href="/images/avatars/04.png" />
<link rel="prefetch" href="/images/avatars/05.png" />
<link rel="prefetch" href="/images/avatars/06.png" />
<link rel="prefetch" href="/images/avatars/07.png" />
<link rel="prefetch" href="/images/avatars/08.png" />
<link rel="prefetch" href="/images/avatars/09.png" />
<link rel="prefetch" href="/images/avatars/10.png" />
Comment on lines +43 to +52
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

⚠️ Missing avatar images and potential reference issues

The prefetch links reference avatar images that don't exist in the expected location. Additionally, there are dynamic avatar references in the codebase that might need adjustment:

  • client/src/ui/modules/settings/Settings.tsx uses dynamic avatar path based on address
  • client/src/ui/modules/social/PlayerId.tsx and EntityAvatar.tsx use random avatar indices
  • A special case avatar "mercenary.png" is referenced in EntityAvatar.tsx

Please ensure:

  1. All referenced avatar images (01.png through 10.png) are added to the public images directory
  2. Update the avatar index generation logic in the components to match the new range (1-10)
  3. Verify if "mercenary.png" should also follow the new naming convention
🔗 Analysis chain

LGTM! Improved avatar naming convention.

The update to a two-digit format (01-10) provides better consistency and sorting. The expansion from 6 to 10 avatars suggests enhanced customization options.

Let's verify the existence of the new avatar images and check for any remaining old-format references:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify avatar images and references
# Test 1: Check if all new avatar images exist
for i in {01..10}; do
  fd "^${i}.png$" "images/avatars"
done

# Test 2: Look for any remaining single-digit avatar references that might need updating
rg -g '!*.html' '[^0-9][1-6]\.png' 

# Test 3: Check for any hardcoded avatar paths that might need updating
ast-grep --pattern 'avatars/[1-6].png'

Length of output: 3281


Script:

#!/bin/bash
# Let's verify if the images directory exists and its structure
fd -t d "images"

# Check for any avatar-related files in the repository
fd -t f "avatar"

# Look for any references to avatar images in the codebase
rg -g '!*.html' "avatar.*\.png"

Length of output: 641


<!-- buildings -->
<!-- contruction -->
<link rel="prefetch" href="/images/buildings/construction/archery.png" />
Expand Down
Loading
Loading