Skip to content

Commit

Permalink
Merge branch 'main' into starknet_2.1.0
Browse files Browse the repository at this point in the history
* main:
  Prepare 0.2.1 (dojoengine#817)
  ERC1155/ERC721 rewrite for better modularity (dojoengine#791)
  feat(torii): NameOrder type for query results ordering (dojoengine#809)
  fix(inline_macro): remove trivia from macro name (dojoengine#813)
  fix(torii): u128 and u256 treated as strings (dojoengine#812)
  chore(torii): add ClassHash scalar type (dojoengine#811)
  fix(torii): add auto incrementing id field to component member db (dojoengine#808)
  chore(torii): update scripts (dojoengine#802)
  feat(compiler): store abi inside manifest.json file (dojoengine#807)
  feat(torii): NameWhereInput type for component filtering (dojoengine#799)
  fix: remove `torii-client-wasm` from workspace + update ci (dojoengine#803)
  `dojo-client` wasm (dojoengine#728)
  chore(torii): update entities keys input/output format (dojoengine#788)
  refactor(sozo): manifest and world address logic (dojoengine#800)
  rename "World seed" to "World name" to be consistent with cli argument (dojoengine#801)
  feat(sozo): default `--name` to be package name from `Scarb.toml` (dojoengine#790)
  added gda (dojoengine#323)
  update `starknet-rs` to v0.5.0

# Conflicts:
#	Cargo.lock
  • Loading branch information
derrick-yang committed Aug 23, 2023
2 parents 17ccde2 + bec0ca2 commit c1a9717
Show file tree
Hide file tree
Showing 130 changed files with 10,316 additions and 1,699 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@ jobs:
- run: |
cargo test
ensure-wasm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}
targets: wasm32-unknown-unknown

- uses: Swatinem/rust-cache@v2
- name: "Ensure `torii-client` crate is wasmable"
run: |
cargo build -r --target wasm32-unknown-unknown -p torii-client
- name: "Ensure `torii-client-wasm` crate is wasmable"
run: |
cargo build -r --target wasm32-unknown-unknown --manifest-path crates/torii/client/wasm/Cargo.toml
# cairofmt:
# runs-on: ubuntu-latest
# steps:
Expand Down Expand Up @@ -59,6 +77,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}
targets: wasm32-unknown-unknown
components: clippy

- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ dojo.iml
*.db-shm
.DS_Store
.env
data
data
Loading

0 comments on commit c1a9717

Please sign in to comment.