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

Implementation of the where API #1217

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
d8a9a3f
Support deriving Introspect for generics (#1082)
tarrencev Nov 23, 2023
e6a870f
Update Graphql test (#1204)
gianalarcon Nov 26, 2023
ed21620
Fix artifact path in release script
tarrencev Nov 26, 2023
c45c5a9
Hardcode plugin version (#1208)
tarrencev Nov 27, 2023
7b72792
Graphql `where` input type check (#1209)
broody Nov 27, 2023
cb91c21
Cleanup release.yml
tarrencev Nov 27, 2023
a253b0c
Prepare v0.3.13
tarrencev Nov 27, 2023
bbb932f
make world upgradeable (#1210)
notV4l Nov 27, 2023
84fbcb7
Rename grpc attribute clause to member (#1211)
broody Nov 27, 2023
8c2f0d9
refactor(spawn-and-move): up to date readme (#1212)
Larkooo Nov 27, 2023
09115ef
Refactor torii core add entity_model table (#1213)
broody Nov 28, 2023
4b3041a
reenabled index and added interface with keys
Sep 9, 2023
3cf0fbc
getting by key
Sep 9, 2023
9d6e8e2
bidirectional reference for keys and debug
Sep 9, 2023
0d4863d
commented out test
Sep 9, 2023
751e0e4
a placeholder for key deletion
Sep 11, 2023
ba545f1
using index in database
Sep 11, 2023
4a7fe8f
using new api in world
Sep 11, 2023
e39bbc9
simple test entities in world
Sep 11, 2023
2bedfea
add .vscode to .gitignore
neotheprogramist Sep 11, 2023
107aabc
disable indexing by default
neotheprogramist Sep 11, 2023
29ec18d
fix tests
neotheprogramist Sep 11, 2023
d0814a3
doc comments
matzayonc Sep 11, 2023
ff2a850
added new test cases
verzotokumpel Sep 13, 2023
0a583f3
improved some tests
verzotokumpel Sep 13, 2023
c25a0eb
updating indexer to use layouts
matzayonc Sep 25, 2023
b135bff
run with CAIRO_FIX_TESTS=1
neotheprogramist Sep 25, 2023
7558656
clippy
neotheprogramist Sep 25, 2023
623a2e5
updated test_entities for new api
matzayonc Sep 25, 2023
3af9991
rebase and comments
matzayonc Sep 28, 2023
d17e49f
ci trigger
matzayonc Sep 28, 2023
345a278
Remove partitions
tarrencev Sep 28, 2023
ad304ba
Propose api
tarrencev Sep 28, 2023
d317078
made future interface compile
Oct 2, 2023
098a8fc
update after rebase
Oct 3, 2023
ebcb6ff
stripping unneeded
Oct 3, 2023
ec77d8c
test fixes
Oct 3, 2023
cfc9d1d
removed keys_layout
Oct 3, 2023
ace6e3c
moved index over values to separate file
Oct 3, 2023
5748f74
working index with values
Oct 3, 2023
1a74a56
entry deletion
Oct 3, 2023
a3ab682
cleaned up indexes
Oct 3, 2023
153c235
universal index
Oct 4, 2023
ee05d90
where condition from entities method
Oct 4, 2023
3af0395
creating indexes with values
Oct 4, 2023
73cc0d5
tests and a fix
Oct 6, 2023
2b01276
added pagination capabilities
Oct 6, 2023
6554234
added key storage and deletion
Oct 6, 2023
ded3051
simplified key deletion
Oct 6, 2023
66252c1
deletion test
Oct 6, 2023
51f6c82
fix after rebase
Oct 6, 2023
66fb813
CAIRO_TEST_FIX=1
Oct 6, 2023
11f0efc
fix after rebase
Oct 9, 2023
3f6c95b
added clause type
Oct 12, 2023
a82678a
test fix after pull
Oct 12, 2023
9e88a04
fix entity_ids
neotheprogramist Oct 16, 2023
a76787f
CAIRO_FIX_TESTS=1
neotheprogramist Oct 16, 2023
f355413
array instead of serialization
Oct 21, 2023
39d26d5
fixes
Oct 21, 2023
ed52836
simple test entities in world
Sep 11, 2023
a703a5a
updating indexer to use layouts
matzayonc Sep 25, 2023
674fb3e
tests and a fix
Oct 6, 2023
90ba900
added clause type
Oct 12, 2023
f3b56ef
fixes after rebase
Oct 21, 2023
6e9f58f
fixes after rebase
Oct 21, 2023
e12a0d2
CAIRO_FIX_TESTS=1
Oct 21, 2023
ec35a03
remove old test
neotheprogramist Nov 3, 2023
382e935
fixes after merge
Nov 6, 2023
e3ad86a
hardcoded value comment
matzayonc Nov 12, 2023
4563cfb
Update clause api to match grpc
tarrencev Nov 21, 2023
78f23b2
Refactor indexing
tarrencev Nov 22, 2023
6069d35
assert to check for empty index
matzayonc Nov 23, 2023
1c651e7
member position in model in clause
matzayonc Nov 28, 2023
7e6083e
fix after rebase
matzayonc Nov 28, 2023
2460339
updated contract address
matzayonc Nov 30, 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
29 changes: 16 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ jobs:
platform: linux
target: x86_64-unknown-linux-gnu
arch: amd64
- os: ubuntu-latest-4-cores
- os: ubuntu-latest-8-cores
platform: linux
target: aarch64-unknown-linux-gnu
arch: arm64
svm_target_platform: linux-aarch64
- os: macos-latest
- os: macos-latest-xlarge
platform: darwin
target: x86_64-apple-darwin
arch: amd64
Expand All @@ -124,9 +124,10 @@ jobs:
with:
cache-on-failure: true

- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: "25.x"

- name: Apple M1 setup
if: ${{ matrix.job.target == 'aarch64-apple-darwin' }}
Expand Down Expand Up @@ -191,10 +192,10 @@ jobs:
body: ${{ needs.prepare.outputs.changelog }}
files: |
${{ steps.artifacts.outputs.file_name }}

# Upload these for use with the Docker build later
- name: Upload binaries
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: binaries
path: |
Expand Down Expand Up @@ -241,10 +242,10 @@ jobs:
uses: actions/checkout@v2

- name: Download binaries
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: binaries
path: target/
path: artifacts

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
Expand All @@ -259,12 +260,13 @@ jobs:
- name: Build and push docker image
uses: docker/build-push-action@v4
with:
no-cache: true
push: true
tags: ghcr.io/${{ github.repository }}:latest,ghcr.io/${{ github.repository }}:${{ needs.prepare.outputs.tag_name }}
platforms: linux/arm64
target: arm64
cache-from: type=gha
cache-to: type=gha,mode=max
build-contexts: |
artifacts=artifacts

docker-build-and-push-linux-amd64:
name: Build and push linux-amd64 docker image
Expand All @@ -276,10 +278,10 @@ jobs:
uses: actions/checkout@v2

- name: Download binaries
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: binaries
path: target/
path: artifacts

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
Expand All @@ -294,9 +296,10 @@ jobs:
- name: Build and push docker image
uses: docker/build-push-action@v4
with:
build-contexts: |
artifacts=artifacts
no-cache: true
push: true
tags: ghcr.io/${{ github.repository }}:latest,ghcr.io/${{ github.repository }}:${{ needs.prepare.outputs.tag_name }}
platforms: linux/amd64
target: amd64
cache-from: type=gha
cache-to: type=gha,mode=max
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ edition = "2021"
license = "Apache-2.0"
license-file = "LICENSE"
repository = "https://github.com/dojoengine/dojo/"
version = "0.3.12"
version = "0.3.13"

[profile.performance]
codegen-units = 1
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ LABEL description="Dojo is a provable game engine and toolchain for building onc
documentation="https://book.dojoengine.org/"

FROM base as amd64
COPY target/x86_64-unknown-linux-gnu/release/katana /usr/local/bin/katana
COPY target/x86_64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo
COPY target/x86_64-unknown-linux-gnu/release/torii /usr/local/bin/torii

COPY --from=artifacts x86_64-unknown-linux-gnu/release/katana /usr/local/bin/katana
COPY --from=artifacts x86_64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo
COPY --from=artifacts x86_64-unknown-linux-gnu/release/torii /usr/local/bin/torii

FROM base as arm64
COPY target/aarch64-unknown-linux-gnu/release/katana /usr/local/bin/katana
COPY target/aarch64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo
COPY target/aarch64-unknown-linux-gnu/release/torii /usr/local/bin/torii

COPY --from=artifacts aarch64-unknown-linux-gnu/release/katana /usr/local/bin/katana
COPY --from=artifacts aarch64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo
COPY --from=artifacts aarch64-unknown-linux-gnu/release/torii /usr/local/bin/torii
6 changes: 3 additions & 3 deletions crates/dojo-core/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ version = 1

[[package]]
name = "dojo"
version = "0.3.12"
version = "0.3.13"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_plugin"
version = "0.3.12"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.12#12d58f29ec53454317f1f6d265007a053d279288"
version = "0.3.11"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659"
4 changes: 2 additions & 2 deletions crates/dojo-core/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
cairo-version = "2.3.1"
description = "The Dojo Core library for autonomous worlds."
name = "dojo"
version = "0.3.12"
version = "0.3.13"

[dependencies]
dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.12" }
dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.11" }
starknet = "2.3.1"
Loading