refactor: crates for c, wasm core (#155)

Author: Larkooo

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install nextest test runner
         uses: taiki-e/install-action@nextest
       - run: |
-          cargo nextest run --all-features --no-tests=pass
+          cargo nextest run --workspace --all-features --no-tests=pass
 
   ensure-wasm:
     name: Check WASM compilation
@@ -46,7 +46,25 @@ jobs:
       - name: Install wasm32 target
         run: rustup target add wasm32-unknown-unknown
       - name: Compile WASM
-        run: cargo build --release --target wasm32-unknown-unknown
+        run: cargo build --release --target wasm32-unknown-unknown -p wasm
+
+  ensure-c:
+    name: Check C bindings compilation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      # Install system dependencies
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y libdbus-1-dev pkg-config
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+      - uses: Swatinem/rust-cache@v2
+      - uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Compile C bindings
+        run: cargo build --release -p c
 
   clippy:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -46,10 +46,10 @@ jobs:
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
       - name: Build WASM (no-modules)
-        run: wasm-pack build --out-dir pkg-no-modules --release --target no-modules
+        run: wasm-pack build crates/wasm --out-dir ../../pkg-no-modules --release --target no-modules
 
       - name: Build WASM (web)
-        run: wasm-pack build --out-dir pkg-web --release --target web
+        run: wasm-pack build crates/wasm --out-dir ../../pkg-web --release --target web
 
       - name: Package WASM builds
         id: wasm_artifacts
@@ -82,6 +82,22 @@ jobs:
             platform: linux
             target: aarch64-unknown-linux-gnu
             arch: arm64
+          - os: ubuntu-latest
+            platform: android
+            target: aarch64-linux-android
+            arch: arm64
+          - os: ubuntu-latest
+            platform: android
+            target: armv7-linux-androideabi
+            arch: armv7
+          - os: ubuntu-latest
+            platform: android
+            target: i686-linux-android
+            arch: x86
+          - os: ubuntu-latest
+            platform: android
+            target: x86_64-linux-android
+            arch: x86_64
           - os: macos-latest
             platform: darwin
             target: x86_64-apple-darwin
@@ -133,9 +149,9 @@ jobs:
       - name: Build binaries
         run: |
           if [[ "${{ runner.os }}" == "Linux" ]]; then
-            cross build --release --target ${{ matrix.job.target }}
+            cross build --release --target ${{ matrix.job.target }} -p c
           else
-            cargo build --release --target ${{ matrix.job.target }}
+            cargo build --release --target ${{ matrix.job.target }} -p c
           fi
         shell: bash
 
@@ -144,13 +160,13 @@ jobs:
         shell: bash
         run: |
           if [[ "${{ matrix.job.os }}" == "macos-latest" ]]; then
-            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz dojo.h target/${{ matrix.job.target }}/release/libdojo_c.dylib
+            tar -czvf dojo-c-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz crates/c/dojo.h target/${{ matrix.job.target }}/release/libc.dylib
           elif [[ "${{ matrix.job.os }}" == "windows-latest" ]]; then
-            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz dojo.h target/${{ matrix.job.target }}/release/dojo_c.dll
+            tar -czvf dojo-c-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz crates/c/dojo.h target/${{ matrix.job.target }}/release/c.dll
           else
-            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz dojo.h target/${{ matrix.job.target }}/release/libdojo_c.so
+            tar -czvf dojo-c-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz crates/c/dojo.h target/${{ matrix.job.target }}/release/libc.so
           fi
-          echo "file_name=torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz" >> $GITHUB_OUTPUT
+          echo "file_name=dojo-c-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz" >> $GITHUB_OUTPUT
 
       - name: Create release
         uses: softprops/action-gh-release@v1

Cargo.lock

@@ -1,22 +1,29 @@
-[package]
+[workspace]
+resolver = "2"
+members = [
+    "crates/dojo-core",
+    "crates/c",
+    "crates/wasm",
+]
+
+[workspace.package]
 edition = "2021"
-name = "dojo-c"
 version = "1.8.3"
 
-[lib]
-crate-type = ["cdylib", "rlib", "staticlib"]
-
-[dependencies]
+[workspace.dependencies]
+# Dojo dependencies
 dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "0afeb1bc" }
 dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "0afeb1bc" }
 torii-proto = { git = "https://github.com/dojoengine/torii", rev = "8378c63" }
 torii-client = { git = "https://github.com/dojoengine/torii", rev = "8378c63" }
 torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "8378c63" }
 
+# Starknet dependencies
 starknet = "0.17.0"
 starknet-crypto = "0.8"
 starknet-types-core = { version = "0.2.0", features = ["arbitrary"] }
 
+# Core dependencies
 parking_lot = "0.12.1"
 tokio = { version = "1.39.2", default-features = false, features = ["rt"] }
 url = "2.5.0"
@@ -26,11 +33,14 @@ serde_json = "1.0.115"
 tokio-stream = "0.1.14"
 futures = "0.3.30"
 futures-channel = "0.3.30"
-wasm-bindgen = "0.2.92"
 stream-cancel = "0.8.2"
 cainome = "0.10.1"
 lazy_static = "1.5.0"
+crypto-bigint = "0.5.5"
+chrono = "0.4.41"
 
+# WASM dependencies
+wasm-bindgen = "0.2.92"
 serde-wasm-bindgen = "0.6.3"
 wasm-bindgen-futures = "0.4.39"
 js-sys = "0.3.77"
@@ -41,25 +51,18 @@ web-sys = { version = "0.3.77", features = [
   'WorkerGlobalScope',
   'console',
 ] }
-crypto-bigint = "0.5.5"
 tsify-next = { version = "0.5.4", features = ["js"] }
 instant = { version = "0.1.13", features = ["wasm-bindgen"] }
 gloo-timers = { version = "0.3.0", features = ["futures"] }
 gloo-utils = { version = "0.2.0", features = ["serde"] }
 num-bigint = "0.4.6"
+console_error_panic_hook = "0.1.5"
 num-traits = "0.2.19"
-chrono = "0.4.41"
-
-[build-dependencies]
-# this addresses issue with cyclical dependencies when generating C header
-# see. https://github.com/mozilla/cbindgen/issues/43
-# cbindgen = { git = "https://github.com/flaviojs/cbindgen_tmp", branch = "resolve-order-dependencies-clike" }
-# cbindgen = "0.29"
-cbindgen = { git = "https://github.com/Larkooo/cbindgen", branch = "no-c-forward-enum" }
-
 
-[dev-dependencies]
-wasm-bindgen-test = "0.3.33"
+# Internal crates
+dojo-core = { path = "crates/dojo-core" }
+c = { path = "crates/c" }
+wasm = { path = "crates/wasm" }
 
 [patch.crates-io]
 crunchy = { git = "https://github.com/nmathewson/crunchy", branch = "cross-compilation-fix" }

Cargo.toml

@@ -11,3 +11,15 @@ pre-build = [
     "protoc --version"
 ]
 
+[target.aarch64-linux-android]
+image = "ghcr.io/cross-rs/aarch64-linux-android:main"
+
+[target.armv7-linux-androideabi]
+image = "ghcr.io/cross-rs/armv7-linux-androideabi:main"
+
+[target.i686-linux-android]
+image = "ghcr.io/cross-rs/i686-linux-android:main"
+
+[target.x86_64-linux-android]
+image = "ghcr.io/cross-rs/x86_64-linux-android:main"
+

Cross.toml

@@ -0,0 +1,34 @@
+[package]
+name = "c"
+version.workspace = true
+edition.workspace = true
+
+[lib]
+crate-type = ["cdylib", "rlib", "staticlib"]
+
+[dependencies]
+dojo-core = { workspace = true }
+
+dojo-world.workspace = true
+dojo-types.workspace = true
+torii-proto.workspace = true
+torii-client.workspace = true
+
+starknet.workspace = true
+starknet-crypto.workspace = true
+
+tokio.workspace = true
+url.workspace = true
+anyhow.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio-stream.workspace = true
+futures.workspace = true
+stream-cancel.workspace = true
+cainome.workspace = true
+lazy_static.workspace = true
+crypto-bigint.workspace = true
+chrono.workspace = true
+
+[build-dependencies]
+cbindgen = { git = "https://github.com/Larkooo/cbindgen", branch = "no-c-forward-enum" }