Use opfs-sahpool from diesel, remove sqlite-web

.cargo/config.toml

@@ -8,7 +8,6 @@ r = "run"
 t = "test"
 xdbg = "run --release --bin xdbg --"
 xli = "run --bin xmtp_cli --"
-xtask = "run --package xtask --"
 
 [build]
 rustflags = ["--cfg", "tracing_unstable"]

.github/workflows/check-ios-android-bindings.yml

@@ -30,7 +30,10 @@ jobs:
           # Mostly to avoid GitHub rate limiting
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - uses: DeterminateSystems/flakehub-cache-action@main
+      - uses: cachix/cachix-action@v14
+        with:
+          name: xmtp
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - name: Cache
         uses: Swatinem/rust-cache@v2
         with:
@@ -60,8 +63,11 @@ jobs:
           # Mostly to avoid GitHub rate limiting
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - uses: DeterminateSystems/flakehub-cache-action@main
-      - name: Cache
+      - uses: cachix/cachix-action@v14
+        with:
+          name: xmtp
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - name: cache rust artifacts
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: |

.github/workflows/lint-wasm-bindings.yaml

@@ -28,7 +28,15 @@ jobs:
         with:
           workspaces: |
             bindings_wasm
+      - name: Install emscripten toolchains
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
       - name: Run clippy and fail on warnings
-        run: cargo clippy --locked --manifest-path bindings_wasm/Cargo.toml --all-features --target wasm32-unknown-unknown --no-deps -- -D warnings
+        run: |
+          source ./emsdk/emsdk_env.sh
+          cargo clippy --locked --manifest-path bindings_wasm/Cargo.toml --all-features --target wasm32-unknown-unknown --no-deps -- -D warnings
       - name: Run format check
         run: cargo fmt --manifest-path bindings_wasm/Cargo.toml --check

.github/workflows/lint-workspace.yaml

@@ -13,7 +13,6 @@ on:
       - "xmtp_id/**"
       - "xmtp_mls/**"
       - "xmtp_proto/**"
-      - "xmtp_v2/**"
       - "xmtp_debug/**"
       - "bindings_node/**"
       - "bindings_ffi/**"

.github/workflows/noop.yml

@@ -18,7 +18,6 @@ on:
       - "!xmtp_id/**"
       - "!xmtp_mls/**"
       - "!xmtp_proto/**"
-      - "!xmtp_v2/**"
       - "!.node-version"
       - "!Cargo.toml"
       - "!Cargo.lock"

.github/workflows/release-wasm-bindings.yml

@@ -1,11 +1,8 @@
 name: Release WASM Bindings
-
 on:
   workflow_dispatch:
-
 env:
   CARGO_TERM_COLOR: always
-
 jobs:
   release:
     permissions:
@@ -14,23 +11,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Update rust toolchains, add target
         run: |
           rustup update
-
+      - name: Install emscripten toolchains
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
       - name: Cache
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             .
             bindings_wasm
-
       - name: Install wasm-bindgen
         uses: taiki-e/install-action@v2
         with:
           tool: wasm-bindgen
-
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -39,19 +38,15 @@ jobs:
           cache: "yarn"
         env:
           SKIP_YARN_COREPACK_CHECK: "1"
-
       - name: Enable corepack
         run: corepack enable
-
       - name: Install dependencies
         working-directory: bindings_wasm
         run: |
           yarn
-
       - name: Build
         working-directory: bindings_wasm
         run: yarn build
-
       - name: Publish to NPM
         uses: JS-DevTools/npm-publish@v3
         with:

.github/workflows/test-ffi-bindings.yml

@@ -1,4 +1,4 @@
-name: Test FFI Bindings
+name: Test iOS/Android Bindings
 on:
   push:
     branches:
@@ -15,7 +15,6 @@ on:
       - "xmtp_id/**"
       - "xmtp_mls/**"
       - "xmtp_proto/**"
-      - "xmtp_v2/**"
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"

.github/workflows/test-http-api.yml

@@ -14,7 +14,6 @@ on:
       - "xmtp_id/**"
       - "xmtp_mls/**"
       - "xmtp_proto/**"
-      - "xmtp_v2/**"
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"

.github/workflows/test-node-bindings.yml

@@ -17,7 +17,6 @@ on:
       - "xmtp_id/**"
       - "xmtp_mls/**"
       - "xmtp_proto/**"
-      - "xmtp_v2/**"
       - ".node-version"
       - "Cargo.toml"
       - "Cargo.lock"

.github/workflows/test-webassembly.yml

@@ -38,8 +38,16 @@ jobs:
             .
       - name: Start Docker containers
         run: dev/up
+      - name: Install emscripten toolchains
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
       - name: Build WebAssembly Packages
-        run: cargo build --locked --tests --release --target wasm32-unknown-unknown -p xmtp_id -p xmtp_mls -p xmtp_api_http -p xmtp_cryptography -p xmtp_common
+        run: |
+          source ./emsdk/emsdk_env.sh
+          cargo build --locked --tests --release --target wasm32-unknown-unknown -p xmtp_id -p xmtp_mls -p xmtp_api_http -p xmtp_cryptography -p xmtp_common
       - name: test with chrome
         run: |
           cargo test --locked --release --target wasm32-unknown-unknown -p xmtp_mls -p xmtp_id -p xmtp_api_http -p xmtp_cryptography -p xmtp_api -- \

.github/workflows/test-workspace.yml

@@ -14,7 +14,6 @@ on:
       - "xmtp_id/**"
       - "xmtp_mls/**"
       - "xmtp_proto/**"
-      - "xmtp_v2/**"
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"

.gitignore

@@ -44,6 +44,7 @@ coverage
 
 # Bower dependency directory (https://bower.io/)
 bower_components
+result/**
 
 # node-waf configuration
 .lock-wscript

.vscode/launch.json

@@ -79,25 +79,6 @@
             "args": [],
             "cwd": "${workspaceFolder}"
         },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug unit tests in library 'xmtp_v2'",
-            "cargo": {
-                "args": [
-                    "test",
-                    "--no-run",
-                    "--lib",
-                    "--package=xmtp_v2"
-                ],
-                "filter": {
-                    "name": "xmtp_v2",
-                    "kind": "lib"
-                }
-            },
-            "args": [],
-            "cwd": "${workspaceFolder}"
-        },
         {
             "type": "lldb",
             "request": "launch",