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

Merge latest katana changes into solis #3

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
74c12c0
Graphql expose model order params (#1332)
gianalarcon Jan 5, 2024
36e5853
refactor(sozo): change priority order for arguments (#1358)
lambda-0x Jan 8, 2024
042d46b
Change model query field to camel case (#1410)
JunichiSugiura Jan 10, 2024
3bb35a6
fix(katana-core): replace compiled class hash with class hash (#1404)
kariy Jan 10, 2024
136a67a
fix: make devcontainer standalone for rust toolchain version (#1411)
glihm Jan 10, 2024
18182a0
tests: refactor and add new tests (#1405)
lambda-0x Jan 10, 2024
3fd7f3c
Update devcontainer image hash: 136a67a (#1412)
tarrencev Jan 11, 2024
942d895
feat(sozo/account): legacy bool flag to use old calldata encoding (#1…
lambda-0x Jan 12, 2024
39d0ba4
feat(katana): write katana logs to tempdir and print log file path to…
lambda-0x Jan 12, 2024
36ba2c5
fix: ensure local manifest and remote manifest models are comparable …
glihm Jan 12, 2024
41a48b8
Prepare release: v0.5.0 (#1430)
tarrencev Jan 12, 2024
7264619
feat: add `ensure_abi` method into model generated contract (#1433)
glihm Jan 13, 2024
7a7daf8
fix: retry on `TransactionHashNotFound` error (#1435)
lambda-0x Jan 14, 2024
518d9df
Move dojo-signers to sozo-signers (#1438)
tarrencev Jan 14, 2024
87599f9
Refactor torii cli to use SocketAddr cli args (#1434)
tarrencev Jan 14, 2024
66b16f8
Update example spawn-and-move (#1413)
dpinones Jan 17, 2024
8fb9941
fix: add more info on model deserialization fail (#1325)
glihm Jan 17, 2024
05e59cf
fix: Support deriving Print for enums (#1091)
0xicosahedron Jan 17, 2024
cdc8cd0
fix(katana-primitives): fix legacy program conversion between RPC and…
kariy Jan 9, 2024
9de724b
refactor(katana): chain id type (#1351)
kariy Jan 9, 2024
b470a09
refactor(katana): improve error handling (#1415)
kariy Jan 12, 2024
3287ffa
refactor(katana): historical block execution context (#1436)
kariy Jan 16, 2024
de5bbe8
feat(katana): db storage intergration (#1440)
kariy Jan 16, 2024
745a190
Switch transaction query arg from id to transactionHash (#1441)
JunichiSugiura Jan 17, 2024
bc6a5c1
Prepare release: v0.5.1-alpha.0 (#1451)
tarrencev Jan 17, 2024
cd410f9
Fix metrics prefix naming (#1453)
broody Jan 17, 2024
79278a6
feat: bindgen crate (#1425)
glihm Jan 18, 2024
e02e430
Increase `katana` RPC request timeout from 2 -> 20 secs (#1455)
kariy Jan 18, 2024
1d86e11
perf(katana-rpc): spawn blocking tasks (#1456)
kariy Jan 18, 2024
30b900b
Refactor `katana` RPC components into smaller crates (#1461)
kariy Jan 20, 2024
3620d72
Move binary crates into a dedicated dir (#1471)
kariy Jan 23, 2024
17616b9
Merge remote-tracking branch 'upstream/main' into solis
remiroyc Jan 23, 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
11 changes: 6 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

RUN apt install -y gh libgmp3-dev

COPY rust-toolchain.toml .
# To allow independent workflow of the container, the rust-toolchain is explicitely given.
RUN echo "1.74.0" > rust_toolchain_version

# Install cargo-binstall
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
RUN rustup toolchain install $(cat rust_toolchain_version) && \
rustup default $(cat rust_toolchain_version) && \
rustup component add clippy && \
rustup component add rustfmt

Expand All @@ -37,14 +38,14 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
mv hurl-4.1.0-aarch64-unknown-linux-gnu/hurl /usr/local/bin/ && \
rm -r hurl-4.1.0-aarch64-unknown-linux-gnu && \
rm hurl.tar.gz && \
rustup component add llvm-tools-preview --toolchain 1.70.0-aarch64-unknown-linux-gnu; \
rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-aarch64-unknown-linux-gnu; \
elif [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
curl -L https://github.com/Orange-OpenSource/hurl/releases/download/4.1.0/hurl-4.1.0-x86_64-unknown-linux-gnu.tar.gz -o hurl.tar.gz && \
tar -xzf hurl.tar.gz && \
mv hurl-4.1.0-x86_64-unknown-linux-gnu/hurl /usr/local/bin/ && \
rm -r hurl-4.1.0-x86_64-unknown-linux-gnu && \
rm hurl.tar.gz && \
rustup component add llvm-tools-preview --toolchain 1.70.0-x86_64-unknown-linux-gnu && \
rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-x86_64-unknown-linux-gnu && \
rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly; \
fi

Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust
{
"name": "Rust",
"image": "ghcr.io/dojoengine/dojo-dev:448ffda",
"image": "ghcr.io/dojoengine/dojo-dev:136a67a",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
47 changes: 42 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.70.0
RUST_VERSION: 1.74.0

jobs:
test:
runs-on: ubuntu-latest-16-cores
container:
image: ghcr.io/dojoengine/dojo-dev:448ffda
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -28,7 +28,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:448ffda
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -58,10 +58,37 @@ jobs:
# - run: cargo install cairo-lang-formatter
# - run: scripts/cairo_fmt.sh --check

dojo-core-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: cargo run --bin sozo -- --manifest-path crates/dojo-core/Scarb.toml test

dojo-spawn-and-move-example-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: cargo run --bin sozo -- --manifest-path examples/spawn-and-move/Scarb.toml test

dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: cargo run --bin dojo-world-abigen -- --check

clippy:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:448ffda
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -70,12 +97,22 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:448ffda
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: scripts/rust_fmt.sh --check

docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: >
scripts/docs.sh

test-hurl:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contents: write
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:448ffda
image: ghcr.io/dojoengine/dojo-dev:136a67a
steps:
# Workaround described here: https://github.com/actions/checkout/issues/760
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.70.0
RUST_VERSION: 1.74.0
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}

jobs:
Expand Down
Loading
Loading