From ffcb23d22514645a77ede65dc5dde43c7bf6d729 Mon Sep 17 00:00:00 2001 From: Yuki Kishimoto Date: Thu, 31 Oct 2024 13:19:39 +0100 Subject: [PATCH] ffi: merge `nostr-ffi` in `nostr-sdk-ffi` Signed-off-by: Yuki Kishimoto --- .github/workflows/publish-python.yaml | 204 --------------- CHANGELOG.md | 3 +- Cargo.lock | 11 +- Cargo.toml | 1 - bindings/README.md | 3 +- bindings/nostr-ffi/.gitignore | 2 - bindings/nostr-ffi/Cargo.toml | 17 -- bindings/nostr-ffi/README.md | 86 ------- .../nostr-ffi/bindings-android/.gitignore | 48 ---- .../bindings-android/build.gradle.kts | 9 - .../bindings-android/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - bindings/nostr-ffi/bindings-android/gradlew | 234 ------------------ .../nostr-ffi/bindings-android/gradlew.bat | 89 ------- .../bindings-android/lib/build.gradle.kts | 86 ------- .../bindings-android/lib/consumer-rules.pro | 0 .../bindings-android/lib/proguard-rules.pro | 28 --- .../lib/src/main/AndroidManifest.xml | 3 - .../bindings-android/settings.gradle.kts | 3 - bindings/nostr-ffi/bindings-python/.gitignore | 16 -- bindings/nostr-ffi/bindings-python/LICENSE | 21 -- .../nostr-ffi/bindings-python/MANIFEST.in | 3 - bindings/nostr-ffi/bindings-python/README.md | 47 ---- .../nostr-ffi/bindings-python/pyproject.toml | 7 - .../bindings-python/requirements.txt | 4 - .../scripts/generate-linux-aarch64.sh | 19 -- .../scripts/generate-linux-x86_64.sh | 18 -- .../scripts/generate-macos-arm64.sh | 19 -- .../scripts/generate-macos-x86_64.sh | 19 -- .../scripts/generate-windows.sh | 19 -- bindings/nostr-ffi/bindings-python/setup.py | 25 -- .../bindings-python/src/nostr/__init__.py | 1 - bindings/nostr-ffi/bindings-swift/.gitignore | 6 - .../nostr-ffi/bindings-swift/Package.swift | 21 -- .../Tests/NostrTests/NostrTests.swift | 6 - .../nostrFFI.xcframework/Info.plist | 59 ----- .../ios-arm64/Headers/module.modulemap | 4 - .../Headers/module.modulemap | 4 - .../Headers/module.modulemap | 4 - bindings/nostr-ffi/build.rs | 14 -- bindings/nostr-ffi/justfile | 149 ----------- bindings/nostr-ffi/src/error.rs | 225 ----------------- bindings/nostr-ffi/src/lib.rs | 54 ---- bindings/nostr-ffi/uniffi.toml | 3 - bindings/nostr-sdk-ffi/Cargo.toml | 5 +- .../nostr-sdk-ffi/bindings-python/README.md | 5 +- .../bindings-python/examples/event_builder.py | 2 +- .../bindings-python/examples/filters.py | 2 +- .../bindings-python/examples/git_version.py | 2 +- .../bindings-python/examples/nip57.py | 2 +- .../bindings-python/examples/tags.py | 2 +- .../bindings-python/src/nostr-sdk/__init__.py | 1 - bindings/nostr-sdk-ffi/build.rs | 74 +++--- bindings/nostr-sdk-ffi/justfile | 4 +- bindings/nostr-sdk-ffi/src/client/builder.rs | 4 +- bindings/nostr-sdk-ffi/src/client/mod.rs | 12 +- bindings/nostr-sdk-ffi/src/client/options.rs | 2 +- bindings/nostr-sdk-ffi/src/client/zapper.rs | 6 +- bindings/nostr-sdk-ffi/src/connect.rs | 33 +-- bindings/nostr-sdk-ffi/src/database/custom.rs | 4 +- bindings/nostr-sdk-ffi/src/database/events.rs | 3 +- bindings/nostr-sdk-ffi/src/database/mod.rs | 2 +- bindings/nostr-sdk-ffi/src/error.rs | 205 +++++++++++++-- bindings/nostr-sdk-ffi/src/lib.rs | 20 +- bindings/nostr-sdk-ffi/src/logger.rs | 3 +- bindings/nostr-sdk-ffi/src/negentropy.rs | 3 +- bindings/nostr-sdk-ffi/src/notifications.rs | 2 +- bindings/nostr-sdk-ffi/src/nwc/mod.rs | 10 +- bindings/nostr-sdk-ffi/src/nwc/options.rs | 2 +- bindings/nostr-sdk-ffi/src/pool/mod.rs | 2 +- bindings/nostr-sdk-ffi/src/pool/result.rs | 2 +- bindings/nostr-sdk-ffi/src/profile.rs | 3 +- .../src/protocol}/event/builder.rs | 28 ++- .../src/protocol}/event/id.rs | 2 +- .../src/protocol}/event/kind.rs | 0 .../src/protocol}/event/mod.rs | 2 +- .../src/protocol}/event/raw.rs | 0 .../src/protocol}/event/tag/kind.rs | 2 +- .../src/protocol}/event/tag/list.rs | 4 +- .../src/protocol}/event/tag/mod.rs | 10 +- .../src/protocol}/event/tag/standard.rs | 26 +- .../src/protocol}/event/unsigned.rs | 4 +- .../src/protocol}/helper.rs | 0 .../src/protocol}/key/mod.rs | 4 +- .../src/protocol}/key/public_key.rs | 0 .../src/protocol}/key/secret_key.rs | 2 +- .../src/protocol}/message/client.rs | 4 +- .../src/protocol}/message/mod.rs | 0 .../src/protocol}/message/relay.rs | 2 +- bindings/nostr-sdk-ffi/src/protocol/mod.rs | 27 ++ .../src/protocol}/nips/mod.rs | 0 .../src/protocol}/nips/nip01.rs | 2 +- .../src/protocol}/nips/nip04.rs | 2 +- .../src/protocol}/nips/nip05.rs | 2 +- .../src/protocol}/nips/nip10.rs | 0 .../src/protocol}/nips/nip11.rs | 2 +- .../src/protocol}/nips/nip13.rs | 0 .../src/protocol}/nips/nip15.rs | 2 +- .../src/protocol}/nips/nip19.rs | 2 +- .../src/protocol}/nips/nip21.rs | 6 +- .../src/protocol}/nips/nip26.rs | 2 +- .../src/protocol}/nips/nip34.rs | 10 +- .../src/protocol}/nips/nip39.rs | 0 .../src/protocol}/nips/nip44.rs | 2 +- .../src/protocol}/nips/nip46.rs | 8 +- .../src/protocol}/nips/nip47.rs | 2 +- .../src/protocol}/nips/nip48.rs | 0 .../src/protocol}/nips/nip49.rs | 2 +- .../src/protocol}/nips/nip51.rs | 6 +- .../src/protocol}/nips/nip53.rs | 2 +- .../src/protocol}/nips/nip56.rs | 0 .../src/protocol}/nips/nip57.rs | 4 +- .../src/protocol}/nips/nip59.rs | 4 +- .../src/protocol}/nips/nip65.rs | 2 +- .../src/protocol}/nips/nip90.rs | 4 +- .../src/protocol}/nips/nip94.rs | 4 +- .../src/protocol}/nips/nip98.rs | 0 .../src/protocol}/signer.rs | 10 +- .../src/protocol}/types/contact.rs | 2 +- .../src/protocol}/types/filter.rs | 6 +- .../src/protocol}/types/image.rs | 0 .../src/protocol}/types/metadata.rs | 4 +- .../src/protocol}/types/mod.rs | 0 .../src/protocol}/types/time.rs | 0 .../src/protocol}/util.rs | 16 +- bindings/nostr-sdk-ffi/src/relay/filtering.rs | 3 +- bindings/nostr-sdk-ffi/src/relay/limits.rs | 5 +- bindings/nostr-sdk-ffi/src/relay/mod.rs | 5 +- bindings/nostr-sdk-ffi/src/relay/options.rs | 2 +- bindings/nostr-sdk-ffi/src/relay/stats.rs | 3 +- .../tests/test_equality.py | 2 +- .../tests/test_generated_bindings.rs | 0 .../tests/test_nip05.py | 2 +- .../tests/test_to_string.py | 2 +- contrib/scripts/check-bindings.sh | 1 - 136 files changed, 444 insertions(+), 1827 deletions(-) delete mode 100644 .github/workflows/publish-python.yaml delete mode 100644 bindings/nostr-ffi/.gitignore delete mode 100644 bindings/nostr-ffi/Cargo.toml delete mode 100644 bindings/nostr-ffi/README.md delete mode 100644 bindings/nostr-ffi/bindings-android/.gitignore delete mode 100644 bindings/nostr-ffi/bindings-android/build.gradle.kts delete mode 100644 bindings/nostr-ffi/bindings-android/gradle.properties delete mode 100644 bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.jar delete mode 100644 bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties delete mode 100755 bindings/nostr-ffi/bindings-android/gradlew delete mode 100644 bindings/nostr-ffi/bindings-android/gradlew.bat delete mode 100644 bindings/nostr-ffi/bindings-android/lib/build.gradle.kts delete mode 100644 bindings/nostr-ffi/bindings-android/lib/consumer-rules.pro delete mode 100644 bindings/nostr-ffi/bindings-android/lib/proguard-rules.pro delete mode 100644 bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml delete mode 100644 bindings/nostr-ffi/bindings-android/settings.gradle.kts delete mode 100644 bindings/nostr-ffi/bindings-python/.gitignore delete mode 100644 bindings/nostr-ffi/bindings-python/LICENSE delete mode 100644 bindings/nostr-ffi/bindings-python/MANIFEST.in delete mode 100644 bindings/nostr-ffi/bindings-python/README.md delete mode 100644 bindings/nostr-ffi/bindings-python/pyproject.toml delete mode 100644 bindings/nostr-ffi/bindings-python/requirements.txt delete mode 100755 bindings/nostr-ffi/bindings-python/scripts/generate-linux-aarch64.sh delete mode 100644 bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh delete mode 100644 bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh delete mode 100644 bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh delete mode 100644 bindings/nostr-ffi/bindings-python/scripts/generate-windows.sh delete mode 100644 bindings/nostr-ffi/bindings-python/setup.py delete mode 100644 bindings/nostr-ffi/bindings-python/src/nostr/__init__.py delete mode 100644 bindings/nostr-ffi/bindings-swift/.gitignore delete mode 100644 bindings/nostr-ffi/bindings-swift/Package.swift delete mode 100644 bindings/nostr-ffi/bindings-swift/Tests/NostrTests/NostrTests.swift delete mode 100644 bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/Info.plist delete mode 100644 bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64/Headers/module.modulemap delete mode 100644 bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap delete mode 100644 bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap delete mode 100644 bindings/nostr-ffi/build.rs delete mode 100755 bindings/nostr-ffi/justfile delete mode 100644 bindings/nostr-ffi/src/error.rs delete mode 100644 bindings/nostr-ffi/src/lib.rs delete mode 100644 bindings/nostr-ffi/uniffi.toml rename bindings/{nostr-ffi => nostr-sdk-ffi}/bindings-python/examples/event_builder.py (94%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/bindings-python/examples/filters.py (79%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/bindings-python/examples/git_version.py (60%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/bindings-python/examples/nip57.py (82%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/bindings-python/examples/tags.py (88%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/builder.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/id.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/kind.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/mod.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/raw.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/tag/kind.rs (99%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/tag/list.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/tag/mod.rs (96%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/tag/standard.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/event/unsigned.rs (95%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/helper.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/key/mod.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/key/public_key.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/key/secret_key.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/message/client.rs (99%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/message/mod.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/message/relay.rs (99%) create mode 100644 bindings/nostr-sdk-ffi/src/protocol/mod.rs rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/mod.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip01.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip04.rs (94%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip05.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip10.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip11.rs (99%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip13.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip15.rs (99%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip19.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip21.rs (93%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip26.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip34.rs (96%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip39.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip44.rs (96%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip46.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip47.rs (99%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip48.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip49.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip51.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip53.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip56.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip57.rs (96%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip59.rs (94%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip65.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip90.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip94.rs (96%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/nips/nip98.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/signer.rs (95%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/contact.rs (97%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/filter.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/image.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/metadata.rs (98%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/mod.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/types/time.rs (100%) rename bindings/{nostr-ffi/src => nostr-sdk-ffi/src/protocol}/util.rs (90%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/tests/test_equality.py (95%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/tests/test_generated_bindings.rs (100%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/tests/test_nip05.py (94%) rename bindings/{nostr-ffi => nostr-sdk-ffi}/tests/test_to_string.py (89%) diff --git a/.github/workflows/publish-python.yaml b/.github/workflows/publish-python.yaml deleted file mode 100644 index d0b2ca811..000000000 --- a/.github/workflows/publish-python.yaml +++ /dev/null @@ -1,204 +0,0 @@ -name: Publish nostr-protocol to PyPI - -on: - workflow_dispatch: - inputs: - dry-run: - description: "Compile without publish to PyPI" - type: boolean - default: false - required: true - -jobs: - build-linux-x86_64: - name: "Build manylinux_2_28_x86_64 wheel" - runs-on: ubuntu-20.04 - strategy: - matrix: - python: - - cp39-cp39 - - cp310-cp310 - - cp311-cp311 - - cp312-cp312 - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - container: - image: quay.io/pypa/manylinux_2_28_x86_64 - env: - PYBIN: "/opt/python/${{ matrix.python }}/bin" - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - # Needed because inside container - - name: "Setup Rust" - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: "Generate nostr.py and binaries" - run: bash ./scripts/generate-linux-x86_64.sh - - - name: "Build wheel" - run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_28_x86_64 --verbose - - - uses: actions/upload-artifact@v4 - with: - name: nostr_protocol-manylinux_2_28_x86_64-${{ matrix.python }} - path: /home/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl - - build-linux-aarch64: - name: "Build manylinux_2_31 aarch64 wheel" - runs-on: ubuntu-20.04 - strategy: - matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - - name: "Setup Python" - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - - name: Install gcc-aarch64-linux-gnu - run: | - sudo apt-get update -y - sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - - - name: "Generate nostr.py and binaries" - run: bash ./scripts/generate-linux-aarch64.sh - - - name: "Build wheel" - run: python3 setup.py bdist_wheel --plat-name manylinux_2_31_aarch64 --verbose - - - uses: actions/upload-artifact@v4 - with: - name: nostr_protocol-manylinux_2_31_aarch64-${{ matrix.python }} - path: /home/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl - - build-macos-arm64: - name: "Build macOS arm64 wheel" - runs-on: macos-13 - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - strategy: - matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - steps: - - name: "Checkout" - uses: actions/checkout@v3 - with: - submodules: true - - - name: "Install Python" - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - - name: "Generate nostr.py and binaries" - run: bash ./scripts/generate-macos-arm64.sh - - - name: "Build wheel" - # Specifying the plat-name argument is necessary to build a wheel with the correct name, - # see issue #350 for more information - run: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 --verbose - - - name: "Upload artifacts" - uses: actions/upload-artifact@v4 - with: - name: nostr_protocol-macos-arm64-${{ matrix.python }} - path: /Users/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl - - build-macos-x86_64: - name: "Build macOS x86_64 wheel" - runs-on: macos-13 - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - strategy: - matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - steps: - - name: "Checkout" - uses: actions/checkout@v3 - with: - submodules: true - - - name: "Install Python" - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - - name: "Generate nostr.py and binaries" - run: bash ./scripts/generate-macos-x86_64.sh - - - name: "Build wheel" - # Specifying the plat-name argument is necessary to build a wheel with the correct name, - # see issue #350 for more information - run: python3 setup.py bdist_wheel --plat-name macosx_11_0_x86_64 --verbose - - - uses: actions/upload-artifact@v4 - with: - name: nostr_protocol-macos-x86_64-${{ matrix.python }} - path: /Users/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl - - build-windows: - name: "Build Windows wheel" - runs-on: windows-2022 - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - strategy: - matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - steps: - - name: "Checkout" - uses: actions/checkout@v3 - with: - submodules: true - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - - name: "Generate nostr.py and binaries" - run: bash ./scripts/generate-windows.sh - - - name: "Build wheel" - run: python setup.py bdist_wheel --verbose - - - name: "Upload artifacts" - uses: actions/upload-artifact@v4 - with: - name: nostr_protocol-win-${{ matrix.python }} - path: D:\a\nostr\nostr\bindings\nostr-ffi\bindings-python\dist\*.whl - - publish-pypi: - name: "Publish on PyPI" - runs-on: ubuntu-20.04 - defaults: - run: - working-directory: bindings/nostr-ffi/bindings-python - needs: [build-linux-x86_64, build-linux-aarch64, build-macos-arm64, build-macos-x86_64, build-windows] - if: github.event.inputs.dry-run == 'false' - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - - name: "Download artifacts in dist/ directory" - uses: actions/download-artifact@v4 - with: - path: dist/ - - - name: "Publish on PyPI" - uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} - packages-dir: dist/*/ diff --git a/CHANGELOG.md b/CHANGELOG.md index cd319f0a4..4e5fc2325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,8 +73,9 @@ * lmdb: mark event as deleted only if database have the target event ([Yuki Kishimoto]) * signer: bootstrap NIP46 signer on demand ([Yuki Kishimoto]) * bindings(nostr): adj. `tag` module ([Yuki Kishimoto]) -* js: change `opt-level` to `z` ([Yuki Kishimoto]) +* ffi: merge `nostr-ffi` in `nostr-sdk-ffi` ([Yuki Kishimoto]) * js: merge `nostr-js` into `nostr-sdk-js` ([Yuki Kishimoto]) +* js: change `opt-level` to `z` ([Yuki Kishimoto]) ### Added diff --git a/Cargo.lock b/Cargo.lock index 226fe4968..60a1beee1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2828,15 +2828,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "nostr-ffi" -version = "0.1.0" -dependencies = [ - "async-trait", - "nostr", - "uniffi", -] - [[package]] name = "nostr-indexeddb" version = "0.35.0" @@ -2951,8 +2942,8 @@ version = "0.1.0" dependencies = [ "async-trait", "async-utility", + "nostr", "nostr-connect", - "nostr-ffi", "nostr-relay-builder", "nostr-sdk", "paranoid-android", diff --git a/Cargo.toml b/Cargo.toml index 8beafcb46..5b713d6c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "bindings/nostr-ffi", "bindings/nostr-sdk-ffi", "bindings/nostr-sdk-js", "bindings/uniffi-bindgen", diff --git a/bindings/README.md b/bindings/README.md index 0540eaca0..9737a5c3e 100644 --- a/bindings/README.md +++ b/bindings/README.md @@ -1,8 +1,7 @@ # rust-nostr bindings - UniFFI (Python, Kotlin, Swift): - * [nostr-ffi](./nostr-ffi): UniFFI bindings of the [nostr] crate - * [nostr-sdk-ffi](./nostr-sdk-ffi): UniFFI bindings of the [nostr-sdk] crate + * [nostr-sdk-ffi](./nostr-sdk-ffi): UniFFI bindings of the [nostr] and [nostr-sdk] crates - JavaScript: * [nostr-sdk-js](./nostr-sdk-js): JavaScript bindings of the [nostr] and [nostr-sdk] crates diff --git a/bindings/nostr-ffi/.gitignore b/bindings/nostr-ffi/.gitignore deleted file mode 100644 index 3a3ab136e..000000000 --- a/bindings/nostr-ffi/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ffi/ -ENV/ \ No newline at end of file diff --git a/bindings/nostr-ffi/Cargo.toml b/bindings/nostr-ffi/Cargo.toml deleted file mode 100644 index 029d19c18..000000000 --- a/bindings/nostr-ffi/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "nostr-ffi" -version = "0.1.0" -edition = "2021" -publish = false - -[lib] -name = "nostr_ffi" -crate-type = ["lib", "cdylib", "staticlib"] - -[dependencies] -async-trait.workspace = true -nostr = { workspace = true, features = ["std", "all-nips"] } -uniffi = { workspace = true, features = ["tokio"] } - -[dev-dependencies] -uniffi = { workspace = true, features = ["bindgen-tests"] } diff --git a/bindings/nostr-ffi/README.md b/bindings/nostr-ffi/README.md deleted file mode 100644 index ef09a9168..000000000 --- a/bindings/nostr-ffi/README.md +++ /dev/null @@ -1,86 +0,0 @@ -# Nostr FFI - -## Prerequisites - -* Rust: https://www.rust-lang.org/tools/install -* Just: https://just.systems/man/en/ (install with `cargo install just`) -* When building for Android: - * NDK v26 - * Set the `ANDROID_SDK_ROOT` env variable (ex. Linux: `~/Android/Sdk`, macOS: `~/Library/Android/sdk`) - * Set the `ANDROID_NDK_HOME` env variable (ex. Linux: `~/Android/Sdk/ndk/`, macOS: `~/Library/Android/sdk/ndk/`) - -## Build - -On first usage you will need to run: - -```bash -just init -``` - -### Python - -For most users, we recommend using our official Python package: [nostr-protocol](https://pypi.org/project/nostr-protocol/) - -If you want to compile from source or need more options, read on. - -### Wheel - -```bash -just python -``` - -### Kotlin - -For most users, we recommend using our official Kotlin package: [org.rust-nostr:nostr](https://central.sonatype.com/artifact/org.rust-nostr/nostr/). - -If you want to compile from source or need more options, read on. - -#### Libraries and Bindings - -This command will build libraries for different platforms in `target/` folder and copy them to `ffi/kotlin/jniLibs`. -In addition it will generate Kotlin bindings in `ffi/kotlin/nostr`. - -```bash -just kotlin -``` - -#### Android Archive (AAR) - -This command will build an AAR file in `ffi/android/lib-release.aar`: - -```bash -just bindings-android -``` - -See [Add your AAR or JAR as a dependency](https://developer.android.com/studio/projects/android-library#psd-add-aar-jar-dependency) in Android's docs for more information on how to integrate such an archive into your project. - -### Swift - -For most users, we recommend using our official Swift package: [rust-nostr/nostr-swift](https://github.com/rust-nostr/nostr-swift). - -If you want to compile from source or need more options, read on. - -#### Swift Module - -These commands will build libraries for different architectures in `../../target/` and generate Swift bindings as well as Swift module artifacts in `ffi/swift-ios/` and `ffi/swift-darwin/` respectively: - -```bash -just swift-ios -``` - -```bash -just swift-darwin -``` - -#### Swift Package - -This command will produce a fully configured Swift Package in `bindings-swift/`. -See [Adding package dependencies to your app](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app) in Apple's docs for more information on how to integrate such a package into your project. - -```bash -just bindings-swift -``` - -## License - -This project is distributed under the MIT software license - see the [LICENSE](../../LICENSE) file for details \ No newline at end of file diff --git a/bindings/nostr-ffi/bindings-android/.gitignore b/bindings/nostr-ffi/bindings-android/.gitignore deleted file mode 100644 index 64b29cdc0..000000000 --- a/bindings/nostr-ffi/bindings-android/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Created by https://www.toptal.com/developers/gitignore/api/android -# Edit at https://www.toptal.com/developers/gitignore?templates=android - -### Android ### -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Log/OS Files -*.log - -# Android Studio generated files and folders -captures/ -.externalNativeBuild/ -.cxx/ -*.apk -output.json - -# IntelliJ -*.iml -.idea/ -misc.xml -deploymentTargetDropDown.xml -render.experimental.xml - -# Keystore files -*.jks -*.keystore - -# Google Services (e.g. APIs or Firebase) -google-services.json - -# Android Profiling -*.hprof - -### Android Patch ### -gen-external-apklibs - -# Replacement of .externalNativeBuild directories introduced -# with Android Studio 3.5. - -# End of https://www.toptal.com/developers/gitignore/api/android - -lib/src/main/jniLibs/ -lib/src/main/kotlin/ diff --git a/bindings/nostr-ffi/bindings-android/build.gradle.kts b/bindings/nostr-ffi/bindings-android/build.gradle.kts deleted file mode 100644 index ff1ab1adf..000000000 --- a/bindings/nostr-ffi/bindings-android/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath("com.android.tools.build:gradle:8.3.0") - } -} diff --git a/bindings/nostr-ffi/bindings-android/gradle.properties b/bindings/nostr-ffi/bindings-android/gradle.properties deleted file mode 100644 index 0ff3d4641..000000000 --- a/bindings/nostr-ffi/bindings-android/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -org.gradle.jvmargs=-Xmx1536m -org.gradle.warning.mode=all -android.useAndroidX=true -android.enableJetifier=true -kotlin.code.style=official diff --git a/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.jar b/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties b/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a5..000000000 --- a/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/bindings/nostr-ffi/bindings-android/gradlew b/bindings/nostr-ffi/bindings-android/gradlew deleted file mode 100755 index 1b6c78733..000000000 --- a/bindings/nostr-ffi/bindings-android/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/bindings/nostr-ffi/bindings-android/gradlew.bat b/bindings/nostr-ffi/bindings-android/gradlew.bat deleted file mode 100644 index 107acd32c..000000000 --- a/bindings/nostr-ffi/bindings-android/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/bindings/nostr-ffi/bindings-android/lib/build.gradle.kts b/bindings/nostr-ffi/bindings-android/lib/build.gradle.kts deleted file mode 100644 index 468894e85..000000000 --- a/bindings/nostr-ffi/bindings-android/lib/build.gradle.kts +++ /dev/null @@ -1,86 +0,0 @@ -plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") version "1.9.22" - id("com.vanniktech.maven.publish") version "0.28.0" - id("signing") -} - -repositories { - mavenCentral() - google() -} - -android { - namespace = "rust.nostr.protocol" - - compileSdk = 34 - - defaultConfig { - minSdk = 21 - - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles(file("proguard-android-optimize.txt"), file("proguard-rules.pro")) - } - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = "1.8" - } -} - -dependencies { - implementation("net.java.dev.jna:jna:5.12.0@aar") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - implementation("androidx.appcompat:appcompat:1.6.1") -} - -mavenPublishing { - configure(com.vanniktech.maven.publish.AndroidMultiVariantLibrary( - sourcesJar = true, - publishJavadocJar = true, - )) - - publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL, automaticRelease = true) - - signAllPublications() - - coordinates("org.rust-nostr", "nostr", "0.35.0") - - pom { - name.set("nostr") - description.set("Nostr protocol implementation") - url.set("https://rust-nostr.org") - licenses { - license { - name.set("MIT") - url.set("https://github.com/rust-nostr/nostr/blob/master/LICENSE") - } - } - developers { - developer { - id.set("yukibtc") - name.set("Yuki Kishimoto") - email.set("yukikishimoto@protonmail.com") - } - } - scm { - connection.set("scm:git:github.com/rust-nostr/nostr.git") - developerConnection.set("scm:git:ssh://github.com/rust-nostr/nostr.git") - url.set("https://github.com/rust-nostr/nostr") - } - } -} - -signing { - useGpgCmd() -} diff --git a/bindings/nostr-ffi/bindings-android/lib/consumer-rules.pro b/bindings/nostr-ffi/bindings-android/lib/consumer-rules.pro deleted file mode 100644 index e69de29bb..000000000 diff --git a/bindings/nostr-ffi/bindings-android/lib/proguard-rules.pro b/bindings/nostr-ffi/bindings-android/lib/proguard-rules.pro deleted file mode 100644 index 5287e7c47..000000000 --- a/bindings/nostr-ffi/bindings-android/lib/proguard-rules.pro +++ /dev/null @@ -1,28 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile - -# for JNA --dontwarn java.awt.* --keep class com.sun.jna.* { *; } --keep class rust.nostr.* { *; } --keepclassmembers class * extends rust.nostr.* { public *; } --keepclassmembers class * extends com.sun.jna.* { public *; } diff --git a/bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml b/bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml deleted file mode 100644 index f79cac1ac..000000000 --- a/bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bindings/nostr-ffi/bindings-android/settings.gradle.kts b/bindings/nostr-ffi/bindings-android/settings.gradle.kts deleted file mode 100644 index 93a18881b..000000000 --- a/bindings/nostr-ffi/bindings-android/settings.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name = "nostr" - -include(":lib") diff --git a/bindings/nostr-ffi/bindings-python/.gitignore b/bindings/nostr-ffi/bindings-python/.gitignore deleted file mode 100644 index 5aa595e0d..000000000 --- a/bindings/nostr-ffi/bindings-python/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.tox/ -dist/ -nostr_protocol.egg-info/ -__pycache__/ -libnostr_ffi.dylib -.idea/ -.DS_Store - -*.swp - -src/nostr/nostr_ffi.py -src/nostr/*.so -*.whl -build/ - -testing-setup-py-simple-example.py diff --git a/bindings/nostr-ffi/bindings-python/LICENSE b/bindings/nostr-ffi/bindings-python/LICENSE deleted file mode 100644 index 2ff564424..000000000 --- a/bindings/nostr-ffi/bindings-python/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022-2023 Yuki Kishimoto - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/bindings/nostr-ffi/bindings-python/MANIFEST.in b/bindings/nostr-ffi/bindings-python/MANIFEST.in deleted file mode 100644 index 676770a1f..000000000 --- a/bindings/nostr-ffi/bindings-python/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include ./src/nostr/libnostr_ffi.dylib -include ./src/nostr/libnostr_ffi.so -include ./src/nostr/nostr_ffi.dll diff --git a/bindings/nostr-ffi/bindings-python/README.md b/bindings/nostr-ffi/bindings-python/README.md deleted file mode 100644 index cc3351ae4..000000000 --- a/bindings/nostr-ffi/bindings-python/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# Nostr - Python Package - -## Description - -Python bindings of [nostr](https://github.com/rust-nostr/nostr) library. - -If you're writing a typical Nostr client or bot, you may be interested in [nostr-sdk](https://pypi.org/project/nostr-sdk/). - -## Getting started - -```shell -pip install nostr-protocol -``` - -```python -from nostr_protocol import Keys, EventBuilder - -keys = Keys.generate() -print(keys.secret_key().to_bech32()) -print(keys.public_key().to_bech32()) - -print("Mining a POW text note...") -event = EventBuilder.text_note("Hello from Rust Nostr Python bindings!", []).to_pow_event(keys, 20) -print(event.as_json()) -``` - -More examples can be found in the [examples/](https://github.com/rust-nostr/nostr/tree/master/bindings/nostr-ffi/bindings-python/examples) directory. - -## Supported NIPs - -Look at - -## Book - -Learn more about `rust-nostr` at . - -## State - -**This library is in an ALPHA state**, things that are implemented generally work but the API will change in breaking ways. - -## Donations - -`rust-nostr` is free and open-source. This means we do not earn any revenue by selling it. Instead, we rely on your financial support. If you actively use any of the `rust-nostr` libs/software/services, then please [donate](https://rust-nostr.org/donate). - -## License - -This project is distributed under the MIT software license - see the [LICENSE](https://github.com/rust-nostr/nostr/tree/master/LICENSE) file for details \ No newline at end of file diff --git a/bindings/nostr-ffi/bindings-python/pyproject.toml b/bindings/nostr-ffi/bindings-python/pyproject.toml deleted file mode 100644 index 133d9fc92..000000000 --- a/bindings/nostr-ffi/bindings-python/pyproject.toml +++ /dev/null @@ -1,7 +0,0 @@ -[build-system] -requires = ["setuptools", "wheel"] - -[tool.pytest.ini_options] -pythonpath = [ - "." -] \ No newline at end of file diff --git a/bindings/nostr-ffi/bindings-python/requirements.txt b/bindings/nostr-ffi/bindings-python/requirements.txt deleted file mode 100644 index bd0cfaa7c..000000000 --- a/bindings/nostr-ffi/bindings-python/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -semantic-version==2.9.0 -typing_extensions==4.0.1 -setuptools==70.0.0 -wheel==0.38.4 diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-linux-aarch64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-linux-aarch64.sh deleted file mode 100755 index 95dcfa168..000000000 --- a/bindings/nostr-ffi/bindings-python/scripts/generate-linux-aarch64.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -python --version -pip install -r requirements.txt - -cd ../ - -echo "Generating native binaries..." -rustup target add aarch64-unknown-linux-gnu -CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc cargo build --release --target aarch64-unknown-linux-gnu - -echo "Generating nostr.py..." -cargo run -p uniffi-bindgen generate --library ../../target/aarch64-unknown-linux-gnu/release/libnostr_ffi.so --language python --no-format -o bindings-python/src/nostr/ - -echo "Copying linux libnostr_ffi.so..." -cp ../../target/aarch64-unknown-linux-gnu/release/libnostr_ffi.so bindings-python/src/nostr/ - -echo "All done!" diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh deleted file mode 100644 index 2b92ed303..000000000 --- a/bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -${PYBIN}/python --version -${PYBIN}/pip install -r requirements.txt - -echo "Generating native binaries..." -rustup target add x86_64-unknown-linux-gnu -cargo build --release --target x86_64-unknown-linux-gnu - -echo "Generating nostr.py..." -cd ../ -cargo run -p uniffi-bindgen generate --library ../../target/x86_64-unknown-linux-gnu/release/libnostr_ffi.so --language python --no-format -o bindings-python/src/nostr/ - -echo "Copying linux libnostr_ffi.so..." -cp ../../target/x86_64-unknown-linux-gnu/release/libnostr_ffi.so bindings-python/src/nostr/ - -echo "All done!" diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh deleted file mode 100644 index 4540d1fcd..000000000 --- a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -python3 --version -pip install --user -r requirements.txt - -cd ../ - -echo "Generating native binaries..." -rustup target add aarch64-apple-darwin -cargo build --release --target aarch64-apple-darwin - -echo "Generating nostr.py..." -cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-darwin/release/libnostr_ffi.dylib --language python --no-format -o bindings-python/src/nostr/ - -echo "Copying libraries libnostr_ffi.dylib..." -cp ../../target/aarch64-apple-darwin/release/libnostr_ffi.dylib bindings-python/src/nostr/ - -echo "All done!" diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh deleted file mode 100644 index 2ab745e7c..000000000 --- a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -python3 --version -pip install --user -r requirements.txt - -cd ../ - -echo "Generating native binaries..." -rustup target add x86_64-apple-darwin -cargo build --release --target x86_64-apple-darwin - -echo "Generating nostr.py..." -cargo run -p uniffi-bindgen generate --library ../../target/x86_64-apple-darwin/release/libnostr_ffi.dylib --language python --no-format -o bindings-python/src/nostr/ - -echo "Copying libraries libnostr_ffi.dylib..." -cp ../../target/x86_64-apple-darwin/release/libnostr_ffi.dylib bindings-python/src/nostr/ - -echo "All done!" diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-windows.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-windows.sh deleted file mode 100644 index fc56a3870..000000000 --- a/bindings/nostr-ffi/bindings-python/scripts/generate-windows.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -python3 --version -pip install --user -r requirements.txt - -cd ../ - -echo "Generating native binaries..." -rustup target add x86_64-pc-windows-msvc -cargo build --release --target x86_64-pc-windows-msvc - -echo "Generating nostr.py..." -cargo run -p uniffi-bindgen generate --library ../../target/x86_64-pc-windows-msvc/release/nostr_ffi.dll --language python --no-format -o bindings-python/src/nostr/ - -echo "Copying libraries nostr_ffi.dll..." -cp ../../target/x86_64-pc-windows-msvc/release/nostr_ffi.dll bindings-python/src/nostr/ - -echo "All done!" diff --git a/bindings/nostr-ffi/bindings-python/setup.py b/bindings/nostr-ffi/bindings-python/setup.py deleted file mode 100644 index 8ca11414f..000000000 --- a/bindings/nostr-ffi/bindings-python/setup.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup -from pathlib import Path - -this_directory = Path(__file__).parent -long_description = (this_directory / "README.md").read_text() - -setup( - name='nostr-protocol', - version='0.35.0', - description="Nostr protocol implementation", - long_description=long_description, - long_description_content_type='text/markdown', - include_package_data=True, - zip_safe=False, - packages=['nostr_protocol'], - package_dir={'nostr_protocol': './src/nostr'}, - url="https://github.com/rust-nostr/nostr", - author="Yuki Kishimoto ", - license="MIT", - # This is required to ensure the library name includes the python version, abi, and platform tags - # See issue #350 for more information - has_ext_modules=lambda: True, -) diff --git a/bindings/nostr-ffi/bindings-python/src/nostr/__init__.py b/bindings/nostr-ffi/bindings-python/src/nostr/__init__.py deleted file mode 100644 index 86b391625..000000000 --- a/bindings/nostr-ffi/bindings-python/src/nostr/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from nostr_protocol.nostr_ffi import * diff --git a/bindings/nostr-ffi/bindings-swift/.gitignore b/bindings/nostr-ffi/bindings-swift/.gitignore deleted file mode 100644 index ec5d58614..000000000 --- a/bindings/nostr-ffi/bindings-swift/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.swiftpm/ -.build/ -*.xcodeproj -Sources/ -**/Headers/*.h -**/nostrFFI.a diff --git a/bindings/nostr-ffi/bindings-swift/Package.swift b/bindings/nostr-ffi/bindings-swift/Package.swift deleted file mode 100644 index f01bcc703..000000000 --- a/bindings/nostr-ffi/bindings-swift/Package.swift +++ /dev/null @@ -1,21 +0,0 @@ -// swift-tools-version:5.5 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "nostr-swift", - platforms: [ - .macOS(.v12), - .iOS(.v14), - ], - products: [ - .library(name: "Nostr", targets: ["nostrFFI", "Nostr"]), - ], - dependencies: [], - targets: [ - .binaryTarget(name: "nostrFFI", path: "./nostrFFI.xcframework"), - .target(name: "Nostr", dependencies: ["nostrFFI"]), - .testTarget(name: "NostrTests", dependencies: ["Nostr"]), - ] -) diff --git a/bindings/nostr-ffi/bindings-swift/Tests/NostrTests/NostrTests.swift b/bindings/nostr-ffi/bindings-swift/Tests/NostrTests/NostrTests.swift deleted file mode 100644 index 2aecaf8e1..000000000 --- a/bindings/nostr-ffi/bindings-swift/Tests/NostrTests/NostrTests.swift +++ /dev/null @@ -1,6 +0,0 @@ -import XCTest -@testable import Nostr - -final class NostrTests: XCTestCase { - func testExample() throws {} -} diff --git a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/Info.plist b/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/Info.plist deleted file mode 100644 index 90bcc1e9f..000000000 --- a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/Info.plist +++ /dev/null @@ -1,59 +0,0 @@ - - - - - AvailableLibraries - - - HeadersPath - Headers - LibraryIdentifier - macos-arm64_x86_64 - LibraryPath - nostrFFI.a - SupportedArchitectures - - arm64 - x86_64 - - SupportedPlatform - macos - - - HeadersPath - Headers - LibraryIdentifier - ios-arm64_x86_64-simulator - LibraryPath - nostrFFI.a - SupportedArchitectures - - arm64 - x86_64 - - SupportedPlatform - ios - SupportedPlatformVariant - simulator - - - HeadersPath - Headers - LibraryIdentifier - ios-arm64 - LibraryPath - nostrFFI.a - SupportedArchitectures - - arm64 - - SupportedPlatform - ios - - - CFBundlePackageType - XFWK - XCFrameworkFormatVersion - 1.0 - - diff --git a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64/Headers/module.modulemap b/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64/Headers/module.modulemap deleted file mode 100644 index 4362a360e..000000000 --- a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64/Headers/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module nostrFFI { - header "nostrFFI.h" - export * -} diff --git a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap b/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap deleted file mode 100644 index 4362a360e..000000000 --- a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module nostrFFI { - header "nostrFFI.h" - export * -} diff --git a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap b/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap deleted file mode 100644 index 4362a360e..000000000 --- a/bindings/nostr-ffi/bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module nostrFFI { - header "nostrFFI.h" - export * -} diff --git a/bindings/nostr-ffi/build.rs b/bindings/nostr-ffi/build.rs deleted file mode 100644 index 399133a1f..000000000 --- a/bindings/nostr-ffi/build.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2022-2023 Yuki Kishimoto -// Copyright (c) 2023-2024 Rust Nostr Developers -// Distributed under the MIT software license - -use std::process::Command; - -fn main() { - if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() { - if let Ok(git_hash) = String::from_utf8(output.stdout) { - println!("cargo:rerun-if-changed={git_hash}"); - println!("cargo:rustc-env=GIT_HASH={git_hash}"); - } - } -} diff --git a/bindings/nostr-ffi/justfile b/bindings/nostr-ffi/justfile deleted file mode 100755 index 9818c5f4c..000000000 --- a/bindings/nostr-ffi/justfile +++ /dev/null @@ -1,149 +0,0 @@ -set windows-shell := ["powershell.exe", "-NoLogo", "-Command"] - -# Check if ANDROID_NDK_HOME env is set -[private] -ndk-home: - @if [ ! -d "${ANDROID_NDK_HOME}" ] ; then \ - echo "Error: Please, set the ANDROID_NDK_HOME env variable to point to your NDK folder" ; \ - exit 1 ; \ - fi - -# Check if ANDROID_SDK_ROOT env is set -[private] -sdk-root: - @if [ ! -d "${ANDROID_SDK_ROOT}" ] ; then \ - echo "Error: Please, set the ANDROID_SDK_ROOT env variable to point to your SDK folder" ; \ - exit 1 ; \ - fi - -# Get toolchain targets and required binaries for compilation -init: - rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim - rustup target add aarch64-apple-darwin x86_64-apple-darwin - rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android - #@if os() == "macos" { cargo install cargo-lipo } - cargo install cargo-lipo - cargo install cbindgen - cargo install cargo-ndk - -[private] -clean-android: - rm -rf ffi/android - rm -rf ffi/kotlin - -[private] -aarch64-linux-android: ndk-home - cargo ndk -t aarch64-linux-android -o ffi/kotlin/jniLibs build --release - -[private] -armv7-linux-androideabi: ndk-home - cargo ndk -t armv7-linux-androideabi -o ffi/kotlin/jniLibs build --release - -[private] -i686-linux-android: ndk-home - cargo ndk -t i686-linux-android -o ffi/kotlin/jniLibs build --release - -[private] -x86_64-linux-android: ndk-home - cargo ndk -t x86_64-linux-android -o ffi/kotlin/jniLibs build --release - -[private] -android: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android - -kotlin: clean-android android - find ./ffi/kotlin/jniLibs -name libnostr_sdk_ffi.so -type f -delete - cargo run -p uniffi-bindgen generate --library ../../target/x86_64-linux-android/release/libnostr_ffi.so --language kotlin --no-format -o ffi/kotlin - -# Copy required modules and libs and assemble AAR -assemble-aar: - rm -rf bindings-android/lib/src/main/jniLibs - rm -rf bindings-android/lib/src/main/kotlin - cp -r ffi/kotlin/jniLibs bindings-android/lib/src/main - mkdir -p bindings-android/lib/src/main/kotlin/ - cp -r ffi/kotlin/rust bindings-android/lib/src/main/kotlin/ - cd bindings-android && ./gradlew assembleRelease - mkdir -p ffi/android - cp bindings-android/lib/build/outputs/aar/lib-release.aar ffi/android - -# Compile and build Android Archive (AAR) -bindings-android: sdk-root kotlin assemble-aar - -# Publish android bindings -[confirm] -publish-android: bindings-android - cd bindings-android && ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache - -[private] -ios-universal: - mkdir -p ../../target/ios-universal/release - mkdir -p ../../target/ios-universal-sim/release - cargo build --release --target aarch64-apple-ios - cargo build --release --target x86_64-apple-ios - cargo build --release --target aarch64-apple-ios-sim - lipo -create -output ../../target/ios-universal/release/libnostr_ffi.a ../../target/aarch64-apple-ios/release/libnostr_ffi.a ../../target/x86_64-apple-ios/release/libnostr_ffi.a - lipo -create -output ../../target/ios-universal-sim/release/libnostr_ffi.a ../../target/aarch64-apple-ios-sim/release/libnostr_ffi.a ../../target/x86_64-apple-ios/release/libnostr_ffi.a - -[private] -darwin-universal: - mkdir -p ../../target/darwin-universal/release - cargo lipo --release --targets aarch64-apple-darwin - cargo lipo --release --targets x86_64-apple-darwin - lipo -create -output ../../target/darwin-universal/release/libnostr_ffi.dylib ../../target/aarch64-apple-darwin/release/libnostr_ffi.dylib ../../target/x86_64-apple-darwin/release/libnostr_ffi.dylib - lipo -create -output ../../target/darwin-universal/release/libnostr_ffi.a ../../target/aarch64-apple-darwin/release/libnostr_ffi.a ../../target/x86_64-apple-darwin/release/libnostr_ffi.a - -swift-ios: ios-universal - cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-ios/release/libnostr_ffi.a --language swift -o ffi/swift-ios - cp ../../target/ios-universal/release/libnostr_ffi.a ffi/swift-ios - cd ffi/swift-ios && "swiftc" "-emit-module" "-module-name" "nostr_ffi" "-Xcc" "-fmodule-map-file={{invocation_directory()}}/ffi/swift-ios/nostrFFI.modulemap" "-I" "." "-L" "." "-lnostr_ffi" nostr_ffi.swift - -swift-darwin: darwin-universal - cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-darwin/release/libnostr_ffi.a --language swift -o ffi/swift-darwin - cp ../../target/darwin-universal/release/libnostr_ffi.dylib ffi/swift-darwin - cd ffi/swift-darwin && "swiftc" "-emit-module" "-module-name" "nostr_ffi" "-Xcc" "-fmodule-map-file={{invocation_directory()}}/ffi/swift-darwin/nostrFFI.modulemap" "-I" "." "-L" "." "-lnostr_ffi" nostr_ffi.swift - -# Copy required modules and libs and assemble Swift Package -assemble-swift-package: - mkdir -p bindings-swift/Sources/Nostr - cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-ios/release/libnostr_ffi.a --no-format --language swift --out-dir bindings-swift/Sources/Nostr - mv bindings-swift/Sources/Nostr/nostr_ffi.swift bindings-swift/Sources/Nostr/Nostr.swift - cp bindings-swift/Sources/Nostr/*.h bindings-swift/nostrFFI.xcframework/ios-arm64/Headers - cp bindings-swift/Sources/Nostr/*.h bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/Headers - cp bindings-swift/Sources/Nostr/*.h bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/Headers - cp ../../target/aarch64-apple-ios/release/libnostr_ffi.a bindings-swift/nostrFFI.xcframework/ios-arm64/nostrFFI.a - cp ../../target/ios-universal-sim/release/libnostr_ffi.a bindings-swift/nostrFFI.xcframework/ios-arm64_x86_64-simulator/nostrFFI.a - cp ../../target/darwin-universal/release/libnostr_ffi.a bindings-swift/nostrFFI.xcframework/macos-arm64_x86_64/nostrFFI.a - rm bindings-swift/Sources/Nostr/*.h - rm bindings-swift/Sources/Nostr/*.modulemap - -# Compile and build Swift Package -bindings-swift: ios-universal darwin-universal assemble-swift-package - -[linux] -python: - rm -rf bindings-python/dist - pip install -r bindings-python/requirements.txt - cargo build --release - cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_ffi.so --language python --no-format -o bindings-python/src/nostr/ - cp ../../target/release/libnostr_ffi.so bindings-python/src/nostr/ - cd bindings-python && python setup.py --verbose bdist_wheel - pip install ./bindings-python/dist/nostr_protocol*.whl --force-reinstall - -[macos] -python: - rm -rf bindings-python/dist - pip install -r bindings-python/requirements.txt - cargo build --release - cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_ffi.dylib --language python --no-format -o bindings-python/src/nostr/ - cp ../../target/release/libnostr_ffi.dylib bindings-python/src/nostr/ - cd bindings-python && python setup.py --verbose bdist_wheel - pip install ./bindings-python/dist/nostr_protocol*.whl --force-reinstall - -[windows] -python: - pip install -r bindings-python\requirements.txt - cargo build --release - cargo run -p uniffi-bindgen generate --library ..\..\target\release\nostr_ffi.dll --language python --no-format -o bindings-python\src\nostr\ - copy ..\..\target\release\nostr_ffi.dll bindings-python\src\nostr - del /F /Q bindings-python\dist\* 2>nul || exit /b 0 - cd bindings-python && python setup.py --verbose bdist_wheel - FOR %%i in (.\bindings-python\dist\*.whl) DO pip install %i --force-reinstall diff --git a/bindings/nostr-ffi/src/error.rs b/bindings/nostr-ffi/src/error.rs deleted file mode 100644 index 046174ed6..000000000 --- a/bindings/nostr-ffi/src/error.rs +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright (c) 2022-2023 Yuki Kishimoto -// Copyright (c) 2023-2024 Rust Nostr Developers -// Distributed under the MIT software license - -use std::fmt; -use std::net::AddrParseError; - -use nostr::message::MessageHandleError; -use uniffi::Error; - -pub type Result = std::result::Result; - -#[derive(Debug, Error)] -#[uniffi(flat_error)] -pub enum NostrError { - Generic(String), -} - -impl std::error::Error for NostrError {} - -impl fmt::Display for NostrError { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::Generic(e) => write!(f, "{e}"), - } - } -} - -impl From for NostrError { - fn from(e: std::num::ParseIntError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: std::char::ParseCharError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::signer::SignerError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::key::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::key::vanity::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: MessageHandleError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::types::metadata::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::event::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::event::builder::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::event::unsigned::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::event::tag::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip01::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip04::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip05::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip06::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip11::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip19::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip21::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip26::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip44::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip46::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip47::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip49::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip53::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip57::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip59::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::nips::nip90::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::secp256k1::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::types::url::ParseError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::hashes::hex::HexToArrayError) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::serde_json::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: nostr::event::id::Error) -> NostrError { - Self::Generic(e.to_string()) - } -} - -impl From for NostrError { - fn from(e: AddrParseError) -> NostrError { - Self::Generic(e.to_string()) - } -} diff --git a/bindings/nostr-ffi/src/lib.rs b/bindings/nostr-ffi/src/lib.rs deleted file mode 100644 index 0db018c58..000000000 --- a/bindings/nostr-ffi/src/lib.rs +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2022-2023 Yuki Kishimoto -// Copyright (c) 2023-2024 Rust Nostr Developers -// Distributed under the MIT software license - -//! Nostr FFI - -#![allow(clippy::new_without_default)] - -use uniffi::Object; - -mod error; -pub mod event; -pub mod helper; -pub mod key; -pub mod message; -pub mod nips; -pub mod signer; -pub mod types; -pub mod util; - -pub use crate::error::NostrError; -pub use crate::event::{Event, EventBuilder, EventId, Kind, KindEnum, Tag, TagKind, UnsignedEvent}; -pub use crate::key::{Keys, PublicKey, SecretKey}; -pub use crate::message::{ClientMessage, ClientMessageEnum, RelayMessage, RelayMessageEnum}; -pub use crate::nips::nip04::{nip04_decrypt, nip04_encrypt}; -pub use crate::nips::nip05::{get_nip05_profile, verify_nip05}; -pub use crate::nips::nip11::RelayInformationDocument; -pub use crate::nips::nip46::{NostrConnectMessage, NostrConnectMetadata, NostrConnectURI}; -pub use crate::nips::nip53::{Image, LiveEvent, LiveEventHost, LiveEventStatus, Person}; -pub use crate::nips::nip65::RelayMetadata; -pub use crate::nips::nip94::FileMetadata; -pub use crate::types::{ - Alphabet, Contact, Filter, ImageDimensions, Metadata, SingleLetterTag, Timestamp, -}; -pub use crate::util::{generate_shared_key, JsonValue}; - -#[derive(Object)] -pub struct NostrLibrary; - -#[uniffi::export] -impl NostrLibrary { - #[inline] - #[uniffi::constructor] - pub fn new() -> Self { - Self - } - - #[inline] - pub fn git_hash_version(&self) -> Option { - option_env!("GIT_HASH").map(|v| v.to_string()) - } -} - -uniffi::setup_scaffolding!(); diff --git a/bindings/nostr-ffi/uniffi.toml b/bindings/nostr-ffi/uniffi.toml deleted file mode 100644 index 385b700b1..000000000 --- a/bindings/nostr-ffi/uniffi.toml +++ /dev/null @@ -1,3 +0,0 @@ -[bindings.kotlin] -package_name = "rust.nostr.protocol" -android_cleaner = true \ No newline at end of file diff --git a/bindings/nostr-sdk-ffi/Cargo.toml b/bindings/nostr-sdk-ffi/Cargo.toml index 890c8604e..0b4e85098 100644 --- a/bindings/nostr-sdk-ffi/Cargo.toml +++ b/bindings/nostr-sdk-ffi/Cargo.toml @@ -16,8 +16,8 @@ ndb = ["nostr-sdk/ndb"] [dependencies] async-trait.workspace = true async-utility.workspace = true +nostr = { workspace = true, features = ["std", "all-nips"] } nostr-connect.workspace = true -nostr-ffi = { path = "../nostr-ffi" } nostr-relay-builder.workspace = true nostr-sdk = { workspace = true, default-features = false, features = ["all-nips", "tor"] } tracing = { workspace = true, features = ["std"] } @@ -26,3 +26,6 @@ uniffi = { workspace = true, features = ["tokio"] } [target.'cfg(target_os = "android")'.dependencies] paranoid-android = "0.2" + +[dev-dependencies] +uniffi = { workspace = true, features = ["bindgen-tests"] } diff --git a/bindings/nostr-sdk-ffi/bindings-python/README.md b/bindings/nostr-sdk-ffi/bindings-python/README.md index b8049b7e7..1c5c8baa0 100644 --- a/bindings/nostr-sdk-ffi/bindings-python/README.md +++ b/bindings/nostr-sdk-ffi/bindings-python/README.md @@ -73,10 +73,7 @@ async def main(): asyncio.run(main()) ``` -More examples can be found at: - -* https://github.com/rust-nostr/nostr/tree/master/bindings/nostr-ffi/bindings-python/examples -* https://github.com/rust-nostr/nostr/tree/master/bindings/nostr-sdk-ffi/bindings-python/examples +More examples can be found [here](https://github.com/rust-nostr/nostr/tree/master/bindings/nostr-sdk-ffi/bindings-python/examples). ## Supported NIPs diff --git a/bindings/nostr-ffi/bindings-python/examples/event_builder.py b/bindings/nostr-sdk-ffi/bindings-python/examples/event_builder.py similarity index 94% rename from bindings/nostr-ffi/bindings-python/examples/event_builder.py rename to bindings/nostr-sdk-ffi/bindings-python/examples/event_builder.py index 58232a09f..de8d000fd 100644 --- a/bindings/nostr-ffi/bindings-python/examples/event_builder.py +++ b/bindings/nostr-sdk-ffi/bindings-python/examples/event_builder.py @@ -1,5 +1,5 @@ import asyncio -from nostr_protocol import Keys, EventBuilder, Kind +from nostr_sdk import Keys, EventBuilder, Kind async def main(): diff --git a/bindings/nostr-ffi/bindings-python/examples/filters.py b/bindings/nostr-sdk-ffi/bindings-python/examples/filters.py similarity index 79% rename from bindings/nostr-ffi/bindings-python/examples/filters.py rename to bindings/nostr-sdk-ffi/bindings-python/examples/filters.py index 22f777042..2f29f69aa 100644 --- a/bindings/nostr-ffi/bindings-python/examples/filters.py +++ b/bindings/nostr-sdk-ffi/bindings-python/examples/filters.py @@ -1,4 +1,4 @@ -from nostr_protocol import Filter, Alphabet, Keys, SingleLetterTag, Kind, KindEnum +from nostr_sdk import Filter, Alphabet, Keys, SingleLetterTag, Kind, KindEnum keys = Keys.generate() diff --git a/bindings/nostr-ffi/bindings-python/examples/git_version.py b/bindings/nostr-sdk-ffi/bindings-python/examples/git_version.py similarity index 60% rename from bindings/nostr-ffi/bindings-python/examples/git_version.py rename to bindings/nostr-sdk-ffi/bindings-python/examples/git_version.py index 8df462e75..40c7685a3 100644 --- a/bindings/nostr-ffi/bindings-python/examples/git_version.py +++ b/bindings/nostr-sdk-ffi/bindings-python/examples/git_version.py @@ -1,4 +1,4 @@ -from nostr_protocol import NostrLibrary +from nostr_sdk import NostrLibrary git_hash = NostrLibrary().git_hash_version() print(git_hash) diff --git a/bindings/nostr-ffi/bindings-python/examples/nip57.py b/bindings/nostr-sdk-ffi/bindings-python/examples/nip57.py similarity index 82% rename from bindings/nostr-ffi/bindings-python/examples/nip57.py rename to bindings/nostr-sdk-ffi/bindings-python/examples/nip57.py index aa5f28675..99a831b67 100644 --- a/bindings/nostr-ffi/bindings-python/examples/nip57.py +++ b/bindings/nostr-sdk-ffi/bindings-python/examples/nip57.py @@ -1,4 +1,4 @@ -from nostr_protocol import Keys, Event, ZapRequestData, PublicKey, SecretKey, EventBuilder, nip57_anonymous_zap_request, nip57_private_zap_request, nip57_decrypt_private_zap_message +from nostr_sdk import Keys, Event, ZapRequestData, PublicKey, SecretKey, EventBuilder, nip57_anonymous_zap_request, nip57_private_zap_request, nip57_decrypt_private_zap_message secret_key = SecretKey.from_hex("6b911fd37cdf5c81d4c0adb1ab7fa822ed253ab0ad9aa18d77257c88b29b718e") keys = Keys(secret_key) diff --git a/bindings/nostr-ffi/bindings-python/examples/tags.py b/bindings/nostr-sdk-ffi/bindings-python/examples/tags.py similarity index 88% rename from bindings/nostr-ffi/bindings-python/examples/tags.py rename to bindings/nostr-sdk-ffi/bindings-python/examples/tags.py index d7f9fa788..ed72c7bce 100644 --- a/bindings/nostr-ffi/bindings-python/examples/tags.py +++ b/bindings/nostr-sdk-ffi/bindings-python/examples/tags.py @@ -1,4 +1,4 @@ -from nostr_protocol import Keys, EventBuilder, PublicKey, Tag, TagEnum +from nostr_sdk import Keys, EventBuilder, PublicKey, Tag, TagEnum keys = Keys.generate() diff --git a/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py b/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py index 300411ef8..f2d5c77ff 100644 --- a/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py +++ b/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py @@ -1,2 +1 @@ -from nostr_sdk.nostr_ffi import * from nostr_sdk.nostr_sdk_ffi import * \ No newline at end of file diff --git a/bindings/nostr-sdk-ffi/build.rs b/bindings/nostr-sdk-ffi/build.rs index a4e1c45f8..c9df5e2ec 100644 --- a/bindings/nostr-sdk-ffi/build.rs +++ b/bindings/nostr-sdk-ffi/build.rs @@ -2,42 +2,50 @@ // Copyright (c) 2023-2024 Rust Nostr Developers // Distributed under the MIT software license -use std::env; -use std::path::Path; +// use std::env; +// use std::path::Path; +use std::process::Command; -const DEFAULT_CLANG_VERSION: &str = "17"; +// const DEFAULT_CLANG_VERSION: &str = "17"; fn main() { - setup_x86_64_android_workaround(); -} - -/// Adds a temporary workaround for an issue with the Rust compiler and Android -/// in x86_64 devices: https://github.com/rust-lang/rust/issues/109717. -/// The workaround comes from: https://github.com/mozilla/application-services/pull/5442 -fn setup_x86_64_android_workaround() { - let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set"); - let target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH not set"); - if target_arch == "x86_64" && target_os == "android" { - let android_ndk_home = env::var("ANDROID_NDK_HOME").expect("ANDROID_NDK_HOME not set"); - let build_os = match env::consts::OS { - "linux" => "linux", - "macos" => "darwin", - "windows" => "windows", - _ => panic!( - "Unsupported OS. You must use either Linux, MacOS or Windows to build the crate." - ), - }; - let clang_version = - env::var("NDK_CLANG_VERSION").unwrap_or_else(|_| DEFAULT_CLANG_VERSION.to_owned()); - let linux_x86_64_lib_dir = format!( - "toolchains/llvm/prebuilt/{build_os}-x86_64/lib/clang/{clang_version}/lib/linux/" - ); - let linkpath = format!("{android_ndk_home}/{linux_x86_64_lib_dir}"); - if Path::new(&linkpath).exists() { - println!("cargo:rustc-link-search={android_ndk_home}/{linux_x86_64_lib_dir}"); - println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android"); - } else { - panic!("Path {linkpath} not exists"); + if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() { + if let Ok(git_hash) = String::from_utf8(output.stdout) { + println!("cargo:rerun-if-changed={git_hash}"); + println!("cargo:rustc-env=GIT_HASH={git_hash}"); } } + + // setup_x86_64_android_workaround(); } + +// /// Adds a temporary workaround for an issue with the Rust compiler and Android +// /// in x86_64 devices: https://github.com/rust-lang/rust/issues/109717. +// /// The workaround comes from: https://github.com/mozilla/application-services/pull/5442 +// fn setup_x86_64_android_workaround() { +// let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set"); +// let target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH not set"); +// if target_arch == "x86_64" && target_os == "android" { +// let android_ndk_home = env::var("ANDROID_NDK_HOME").expect("ANDROID_NDK_HOME not set"); +// let build_os = match env::consts::OS { +// "linux" => "linux", +// "macos" => "darwin", +// "windows" => "windows", +// _ => panic!( +// "Unsupported OS. You must use either Linux, MacOS or Windows to build the crate." +// ), +// }; +// let clang_version = +// env::var("NDK_CLANG_VERSION").unwrap_or_else(|_| DEFAULT_CLANG_VERSION.to_owned()); +// let linux_x86_64_lib_dir = format!( +// "toolchains/llvm/prebuilt/{build_os}-x86_64/lib/clang/{clang_version}/lib/linux/" +// ); +// let linkpath = format!("{android_ndk_home}/{linux_x86_64_lib_dir}"); +// if Path::new(&linkpath).exists() { +// println!("cargo:rustc-link-search={android_ndk_home}/{linux_x86_64_lib_dir}"); +// println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android"); +// } else { +// panic!("Path {linkpath} not exists"); +// } +// } +// } diff --git a/bindings/nostr-sdk-ffi/justfile b/bindings/nostr-sdk-ffi/justfile index 85b95bb4e..2e9200589 100755 --- a/bindings/nostr-sdk-ffi/justfile +++ b/bindings/nostr-sdk-ffi/justfile @@ -124,8 +124,8 @@ python: rm -rf bindings-python/dist pip install -r bindings-python/requirements.txt cargo build --release - cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/ - cp ../../target/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/ + cargo run -p uniffi-bindgen generate --library ../../target/x86_64-unknown-linux-gnu/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/ + cp ../../target/x86_64-unknown-linux-gnu/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/ cd bindings-python && python setup.py --verbose bdist_wheel pip install ./bindings-python/dist/nostr_sdk*.whl --force-reinstall diff --git a/bindings/nostr-sdk-ffi/src/client/builder.rs b/bindings/nostr-sdk-ffi/src/client/builder.rs index 00484044c..6a1178f4b 100644 --- a/bindings/nostr-sdk-ffi/src/client/builder.rs +++ b/bindings/nostr-sdk-ffi/src/client/builder.rs @@ -5,8 +5,6 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::helper::unwrap_or_clone_arc; -use nostr_ffi::signer::{NostrSigner, NostrSignerFFI2Rust}; use nostr_sdk::database::DynNostrDatabase; use nostr_sdk::zapper::DynNostrZapper; use uniffi::Object; @@ -14,6 +12,8 @@ use uniffi::Object; use super::zapper::NostrZapper; use super::{Client, ClientSdk, Options}; use crate::database::NostrDatabase; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::signer::{NostrSigner, NostrSignerFFI2Rust}; #[derive(Clone, Default, Object)] pub struct ClientBuilder { diff --git a/bindings/nostr-sdk-ffi/src/client/mod.rs b/bindings/nostr-sdk-ffi/src/client/mod.rs index 8c1eceabd..1074dc3b5 100644 --- a/bindings/nostr-sdk-ffi/src/client/mod.rs +++ b/bindings/nostr-sdk-ffi/src/client/mod.rs @@ -7,12 +7,6 @@ use std::ops::Deref; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::nips::nip59::UnwrappedGift; -use nostr_ffi::signer::{NostrSigner, NostrSignerFFI2Rust, NostrSignerRust2FFI}; -use nostr_ffi::{ - ClientMessage, Event, EventBuilder, EventId, FileMetadata, Filter, Metadata, PublicKey, - Timestamp, -}; use nostr_sdk::client::Client as ClientSdk; use nostr_sdk::pool::RelayPoolNotification as RelayPoolNotificationSdk; use nostr_sdk::{SubscriptionId, UncheckedUrl}; @@ -29,6 +23,12 @@ use crate::database::events::Events; use crate::error::Result; use crate::pool::result::{Output, ReconciliationOutput, SendEventOutput, SubscribeOutput}; use crate::pool::RelayPool; +use crate::protocol::nips::nip59::UnwrappedGift; +use crate::protocol::signer::{NostrSigner, NostrSignerFFI2Rust, NostrSignerRust2FFI}; +use crate::protocol::{ + ClientMessage, Event, EventBuilder, EventId, FileMetadata, Filter, Metadata, PublicKey, + Timestamp, +}; use crate::relay::options::{SubscribeAutoCloseOptions, SyncOptions}; use crate::relay::RelayFiltering; use crate::{HandleNotification, NostrDatabase, Relay}; diff --git a/bindings/nostr-sdk-ffi/src/client/options.rs b/bindings/nostr-sdk-ffi/src/client/options.rs index 18f0cefca..d8c8c0de3 100644 --- a/bindings/nostr-sdk-ffi/src/client/options.rs +++ b/bindings/nostr-sdk-ffi/src/client/options.rs @@ -7,12 +7,12 @@ use std::ops::Deref; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::helper::unwrap_or_clone_arc; use nostr_sdk::client::options; use nostr_sdk::pool; use uniffi::{Enum, Object}; use crate::error::Result; +use crate::protocol::helper::unwrap_or_clone_arc; use crate::relay::{ConnectionMode, RelayFilteringMode, RelayLimits}; #[derive(Clone, Object)] diff --git a/bindings/nostr-sdk-ffi/src/client/zapper.rs b/bindings/nostr-sdk-ffi/src/client/zapper.rs index ecec087b2..54af7d6a4 100644 --- a/bindings/nostr-sdk-ffi/src/client/zapper.rs +++ b/bindings/nostr-sdk-ffi/src/client/zapper.rs @@ -5,14 +5,14 @@ use core::ops::Deref; use std::sync::Arc; -use nostr_ffi::helper::unwrap_or_clone_arc; -use nostr_ffi::nips::nip57::ZapType; -use nostr_ffi::{EventId, PublicKey}; use nostr_sdk::zapper::{DynNostrZapper, IntoNostrZapper}; use nostr_sdk::{client, nwc}; use uniffi::Object; use crate::nwc::NWC; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::nips::nip57::ZapType; +use crate::protocol::{EventId, PublicKey}; /// Zap entity #[derive(Debug, PartialEq, Eq, Hash, Object)] diff --git a/bindings/nostr-sdk-ffi/src/connect.rs b/bindings/nostr-sdk-ffi/src/connect.rs index 33cb34a0f..ff4450d4c 100644 --- a/bindings/nostr-sdk-ffi/src/connect.rs +++ b/bindings/nostr-sdk-ffi/src/connect.rs @@ -7,14 +7,14 @@ use std::sync::Arc; use std::time::Duration; use nostr_connect::{client, signer}; -use nostr_ffi::nips::nip46::{Nip46Request, NostrConnectURI}; -use nostr_ffi::signer::NostrSigner; -use nostr_ffi::{Event, Keys, NostrError, PublicKey, SecretKey, UnsignedEvent}; use nostr_sdk::nostr::nips::nip46::Request; use nostr_sdk::signer::NostrSigner as _; use uniffi::Object; use crate::error::Result; +use crate::protocol::nips::nip46::{Nip46Request, NostrConnectURI}; +use crate::protocol::signer::NostrSigner; +use crate::protocol::{Event, Keys, PublicKey, SecretKey, UnsignedEvent}; use crate::relay::RelayOptions; #[derive(Object)] @@ -79,14 +79,11 @@ impl NostrConnect { #[uniffi::export] #[async_trait::async_trait] impl NostrSigner for NostrConnect { - async fn get_public_key(&self) -> Result>, NostrError> { + async fn get_public_key(&self) -> Result>> { Ok(Some(Arc::new(self.inner.get_public_key().await?.into()))) } - async fn sign_event( - &self, - unsigned: Arc, - ) -> Result>, NostrError> { + async fn sign_event(&self, unsigned: Arc) -> Result>> { Ok(Some(Arc::new( self.inner .sign_event(unsigned.as_ref().deref().clone()) @@ -95,11 +92,7 @@ impl NostrSigner for NostrConnect { ))) } - async fn nip04_encrypt( - &self, - public_key: Arc, - content: String, - ) -> Result { + async fn nip04_encrypt(&self, public_key: Arc, content: String) -> Result { Ok(self .inner .nip04_encrypt(public_key.as_ref().deref(), &content) @@ -110,29 +103,21 @@ impl NostrSigner for NostrConnect { &self, public_key: Arc, encrypted_content: String, - ) -> Result { + ) -> Result { Ok(self .inner .nip04_decrypt(public_key.as_ref().deref(), &encrypted_content) .await?) } - async fn nip44_encrypt( - &self, - public_key: Arc, - content: String, - ) -> Result { + async fn nip44_encrypt(&self, public_key: Arc, content: String) -> Result { Ok(self .inner .nip44_encrypt(public_key.as_ref().deref(), &content) .await?) } - async fn nip44_decrypt( - &self, - public_key: Arc, - payload: String, - ) -> Result { + async fn nip44_decrypt(&self, public_key: Arc, payload: String) -> Result { Ok(self .inner .nip44_decrypt(public_key.as_ref().deref(), &payload) diff --git a/bindings/nostr-sdk-ffi/src/database/custom.rs b/bindings/nostr-sdk-ffi/src/database/custom.rs index 7d1cd3ace..494162a43 100644 --- a/bindings/nostr-sdk-ffi/src/database/custom.rs +++ b/bindings/nostr-sdk-ffi/src/database/custom.rs @@ -5,12 +5,12 @@ use std::fmt; use std::sync::Arc; -use nostr_ffi::nips::nip01::Coordinate; -use nostr_ffi::{Event, EventId, Filter, Timestamp}; use nostr_sdk::database; use uniffi::Enum; use crate::error::Result; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::{Event, EventId, Filter, Timestamp}; #[derive(Enum)] pub enum DatabaseEventStatus { diff --git a/bindings/nostr-sdk-ffi/src/database/events.rs b/bindings/nostr-sdk-ffi/src/database/events.rs index a5098f807..f6fb8356a 100644 --- a/bindings/nostr-sdk-ffi/src/database/events.rs +++ b/bindings/nostr-sdk-ffi/src/database/events.rs @@ -5,10 +5,11 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::Event; use nostr_sdk::database; use uniffi::Object; +use crate::protocol::Event; + #[derive(Clone, Object)] pub struct Events { inner: database::Events, diff --git a/bindings/nostr-sdk-ffi/src/database/mod.rs b/bindings/nostr-sdk-ffi/src/database/mod.rs index 2524e1a79..af4e5a388 100644 --- a/bindings/nostr-sdk-ffi/src/database/mod.rs +++ b/bindings/nostr-sdk-ffi/src/database/mod.rs @@ -5,7 +5,6 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::{Event, EventId, Filter, PublicKey}; use nostr_sdk::database::{DynNostrDatabase, IntoNostrDatabase, NostrDatabaseExt}; #[cfg(feature = "ndb")] use nostr_sdk::NdbDatabase; @@ -19,6 +18,7 @@ pub mod events; use self::custom::{CustomNostrDatabase, IntermediateCustomNostrDatabase}; use crate::error::Result; use crate::profile::Profile; +use crate::protocol::{Event, EventId, Filter, PublicKey}; #[derive(Object)] pub struct NostrDatabase { diff --git a/bindings/nostr-sdk-ffi/src/error.rs b/bindings/nostr-sdk-ffi/src/error.rs index a6db995fe..7a5871da7 100644 --- a/bindings/nostr-sdk-ffi/src/error.rs +++ b/bindings/nostr-sdk-ffi/src/error.rs @@ -5,6 +5,7 @@ use std::fmt; use std::net::AddrParseError; +use nostr::message::MessageHandleError; use tracing::subscriber::SetGlobalDefaultError; use uniffi::Error; @@ -26,38 +27,194 @@ impl fmt::Display for NostrSdkError { } } -impl From for NostrSdkError { - fn from(e: nostr_ffi::NostrError) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: std::num::ParseIntError) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::nips::nip59::Error) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: std::char::ParseCharError) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: SetGlobalDefaultError) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: nostr::signer::SignerError) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::client::Error) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: nostr::key::Error) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::pool::relay::Error) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: nostr::key::vanity::Error) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::pool::pool::Error) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: MessageHandleError) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::types::metadata::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::event::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::event::builder::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::event::unsigned::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::event::tag::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip01::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip04::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip05::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip06::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip11::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip19::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip21::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip26::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip44::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip46::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip47::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip49::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip53::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip57::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip59::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::nips::nip90::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::secp256k1::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::types::url::ParseError) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::hashes::hex::HexToArrayError) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::serde_json::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr::event::id::Error) -> NostrSdkError { Self::Generic(e.to_string()) } } @@ -68,20 +225,32 @@ impl From for NostrSdkError { } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::types::url::ParseError) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: SetGlobalDefaultError) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::database::DatabaseError) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: nostr_sdk::client::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr_sdk::pool::relay::Error) -> NostrSdkError { Self::Generic(e.to_string()) } } -impl From for NostrSdkError { - fn from(e: nostr_sdk::signer::SignerError) -> NostrSdkError { +impl From for NostrSdkError { + fn from(e: nostr_sdk::pool::pool::Error) -> NostrSdkError { + Self::Generic(e.to_string()) + } +} + +impl From for NostrSdkError { + fn from(e: nostr_sdk::database::DatabaseError) -> NostrSdkError { Self::Generic(e.to_string()) } } diff --git a/bindings/nostr-sdk-ffi/src/lib.rs b/bindings/nostr-sdk-ffi/src/lib.rs index 6c63749b1..d5c50da9d 100644 --- a/bindings/nostr-sdk-ffi/src/lib.rs +++ b/bindings/nostr-sdk-ffi/src/lib.rs @@ -4,7 +4,7 @@ #![allow(clippy::new_without_default)] -nostr_ffi::uniffi_reexport_scaffolding!(); +use uniffi::Object; pub mod client; pub mod connect; @@ -17,6 +17,7 @@ pub mod notifications; pub mod nwc; pub mod pool; pub mod profile; +pub mod protocol; pub mod relay; pub use self::client::{Client, ClientBuilder, Options}; @@ -26,4 +27,21 @@ pub use self::logger::{init_logger, LogLevel}; pub use self::notifications::HandleNotification; pub use self::relay::{Relay, RelayConnectionStats, RelayStatus}; +#[derive(Object)] +pub struct NostrLibrary; + +#[uniffi::export] +impl NostrLibrary { + #[inline] + #[uniffi::constructor] + pub fn new() -> Self { + Self + } + + #[inline] + pub fn git_hash_version(&self) -> Option { + option_env!("GIT_HASH").map(|v| v.to_string()) + } +} + uniffi::setup_scaffolding!(); diff --git a/bindings/nostr-sdk-ffi/src/logger.rs b/bindings/nostr-sdk-ffi/src/logger.rs index 9c2e2857b..d47ee94ea 100644 --- a/bindings/nostr-sdk-ffi/src/logger.rs +++ b/bindings/nostr-sdk-ffi/src/logger.rs @@ -2,7 +2,6 @@ // Copyright (c) 2023-2024 Rust Nostr Developers // Distributed under the MIT software license -use nostr_ffi::NostrLibrary; use tracing::Level; #[cfg(any(target_os = "android", target_os = "ios"))] use tracing_subscriber::filter::Targets; @@ -16,6 +15,8 @@ use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::Layer; use uniffi::Enum; +use crate::NostrLibrary; + #[derive(Enum)] pub enum LogLevel { Error, diff --git a/bindings/nostr-sdk-ffi/src/negentropy.rs b/bindings/nostr-sdk-ffi/src/negentropy.rs index 9d2a6e1fa..36c27236c 100644 --- a/bindings/nostr-sdk-ffi/src/negentropy.rs +++ b/bindings/nostr-sdk-ffi/src/negentropy.rs @@ -4,9 +4,10 @@ use std::sync::Arc; -use nostr_ffi::{EventId, Timestamp}; use uniffi::Record; +use crate::protocol::{EventId, Timestamp}; + #[derive(Record)] pub struct NegentropyItem { pub id: Arc, diff --git a/bindings/nostr-sdk-ffi/src/notifications.rs b/bindings/nostr-sdk-ffi/src/notifications.rs index 05c6a9a54..cf2b03bf5 100644 --- a/bindings/nostr-sdk-ffi/src/notifications.rs +++ b/bindings/nostr-sdk-ffi/src/notifications.rs @@ -4,7 +4,7 @@ use std::sync::Arc; -use nostr_ffi::{Event, RelayMessage}; +use crate::protocol::{Event, RelayMessage}; #[uniffi::export(with_foreign)] #[async_trait::async_trait] diff --git a/bindings/nostr-sdk-ffi/src/nwc/mod.rs b/bindings/nostr-sdk-ffi/src/nwc/mod.rs index f4e2e9235..c7b1fba81 100644 --- a/bindings/nostr-sdk-ffi/src/nwc/mod.rs +++ b/bindings/nostr-sdk-ffi/src/nwc/mod.rs @@ -4,11 +4,6 @@ use std::ops::Deref; -use nostr_ffi::nips::nip47::{ - GetInfoResponseResult, ListTransactionsRequestParams, LookupInvoiceRequestParams, - LookupInvoiceResponseResult, MakeInvoiceRequestParams, MakeInvoiceResponseResult, - NostrWalletConnectURI, PayKeysendRequestParams, PayKeysendResponseResult, -}; use nostr_sdk::nwc; use uniffi::Object; @@ -16,6 +11,11 @@ pub mod options; use self::options::NostrWalletConnectOptions; use crate::error::Result; +use crate::protocol::nips::nip47::{ + GetInfoResponseResult, ListTransactionsRequestParams, LookupInvoiceRequestParams, + LookupInvoiceResponseResult, MakeInvoiceRequestParams, MakeInvoiceResponseResult, + NostrWalletConnectURI, PayKeysendRequestParams, PayKeysendResponseResult, +}; /// Nostr Wallet Connect client #[derive(Object)] diff --git a/bindings/nostr-sdk-ffi/src/nwc/options.rs b/bindings/nostr-sdk-ffi/src/nwc/options.rs index 40fcd7278..6bc7091fc 100644 --- a/bindings/nostr-sdk-ffi/src/nwc/options.rs +++ b/bindings/nostr-sdk-ffi/src/nwc/options.rs @@ -6,11 +6,11 @@ use std::ops::Deref; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::helper::unwrap_or_clone_arc; use nostr_sdk::{nwc, pool}; use uniffi::Object; use crate::error::Result; +use crate::protocol::helper::unwrap_or_clone_arc; use crate::relay::options::ConnectionMode; /// NWC options diff --git a/bindings/nostr-sdk-ffi/src/pool/mod.rs b/bindings/nostr-sdk-ffi/src/pool/mod.rs index aab642275..5f3f31368 100644 --- a/bindings/nostr-sdk-ffi/src/pool/mod.rs +++ b/bindings/nostr-sdk-ffi/src/pool/mod.rs @@ -7,7 +7,6 @@ use std::ops::Deref; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::{ClientMessage, Event, Filter}; use nostr_sdk::database::DynNostrDatabase; use nostr_sdk::{RelayPoolOptions, SubscriptionId}; use uniffi::Object; @@ -18,6 +17,7 @@ use self::result::{Output, SendEventOutput, SubscribeOutput}; use crate::database::events::Events; use crate::error::Result; use crate::pool::result::ReconciliationOutput; +use crate::protocol::{ClientMessage, Event, Filter}; use crate::relay::options::{FilterOptions, SyncOptions}; use crate::relay::{RelayFiltering, RelayOptions, RelaySendOptions, SubscribeOptions}; use crate::{HandleNotification, NostrDatabase, Relay}; diff --git a/bindings/nostr-sdk-ffi/src/pool/result.rs b/bindings/nostr-sdk-ffi/src/pool/result.rs index 6a88c735e..32ef93d71 100644 --- a/bindings/nostr-sdk-ffi/src/pool/result.rs +++ b/bindings/nostr-sdk-ffi/src/pool/result.rs @@ -5,10 +5,10 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; -use nostr_ffi::EventId; use nostr_sdk::{pool, SubscriptionId, Url}; use uniffi::Record; +use crate::protocol::EventId; use crate::relay::Reconciliation; /// Output diff --git a/bindings/nostr-sdk-ffi/src/profile.rs b/bindings/nostr-sdk-ffi/src/profile.rs index bf824b56f..bea4eeb74 100644 --- a/bindings/nostr-sdk-ffi/src/profile.rs +++ b/bindings/nostr-sdk-ffi/src/profile.rs @@ -5,10 +5,11 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::{Metadata, PublicKey}; use nostr_sdk::database; use uniffi::Object; +use crate::protocol::{Metadata, PublicKey}; + #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] pub struct Profile { diff --git a/bindings/nostr-ffi/src/event/builder.rs b/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs similarity index 97% rename from bindings/nostr-ffi/src/event/builder.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/builder.rs index 249dc8e3c..c5374d067 100644 --- a/bindings/nostr-ffi/src/event/builder.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs @@ -12,19 +12,21 @@ use uniffi::Object; use super::{Event, EventId, Kind}; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::key::Keys; -use crate::nips::nip01::Coordinate; -use crate::nips::nip15::{ProductData, StallData}; -use crate::nips::nip34::{GitIssue, GitPatch, GitRepositoryAnnouncement}; -use crate::nips::nip51::{ArticlesCuration, Bookmarks, EmojiInfo, Emojis, Interests, MuteList}; -use crate::nips::nip53::LiveEvent; -use crate::nips::nip57::ZapRequestData; -use crate::nips::nip90::JobFeedbackData; -use crate::nips::nip98::HttpData; -use crate::signer::{NostrSigner, NostrSignerFFI2Rust}; -use crate::types::{Contact, Metadata}; -use crate::{ +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::key::Keys; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::nips::nip15::{ProductData, StallData}; +use crate::protocol::nips::nip34::{GitIssue, GitPatch, GitRepositoryAnnouncement}; +use crate::protocol::nips::nip51::{ + ArticlesCuration, Bookmarks, EmojiInfo, Emojis, Interests, MuteList, +}; +use crate::protocol::nips::nip53::LiveEvent; +use crate::protocol::nips::nip57::ZapRequestData; +use crate::protocol::nips::nip90::JobFeedbackData; +use crate::protocol::nips::nip98::HttpData; +use crate::protocol::signer::{NostrSigner, NostrSignerFFI2Rust}; +use crate::protocol::types::{Contact, Metadata}; +use crate::protocol::{ FileMetadata, Image, ImageDimensions, NostrConnectMessage, PublicKey, RelayMetadata, Tag, Timestamp, UnsignedEvent, }; diff --git a/bindings/nostr-ffi/src/event/id.rs b/bindings/nostr-sdk-ffi/src/protocol/event/id.rs similarity index 98% rename from bindings/nostr-ffi/src/event/id.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/id.rs index 48e22e4e2..d3659997b 100644 --- a/bindings/nostr-ffi/src/event/id.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/id.rs @@ -11,7 +11,7 @@ use uniffi::Object; use super::Kind; use crate::error::Result; -use crate::{PublicKey, Tag, Timestamp}; +use crate::protocol::{PublicKey, Tag, Timestamp}; #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/event/kind.rs b/bindings/nostr-sdk-ffi/src/protocol/event/kind.rs similarity index 100% rename from bindings/nostr-ffi/src/event/kind.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/kind.rs diff --git a/bindings/nostr-ffi/src/event/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/event/mod.rs similarity index 98% rename from bindings/nostr-ffi/src/event/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/mod.rs index e0933d0b5..e60efa84a 100644 --- a/bindings/nostr-ffi/src/event/mod.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/mod.rs @@ -20,7 +20,7 @@ pub use self::kind::{Kind, KindEnum}; pub use self::tag::{Tag, TagKind, TagStandard, Tags}; pub use self::unsigned::UnsignedEvent; use crate::error::Result; -use crate::{PublicKey, Timestamp}; +use crate::protocol::{PublicKey, Timestamp}; #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/event/raw.rs b/bindings/nostr-sdk-ffi/src/protocol/event/raw.rs similarity index 100% rename from bindings/nostr-ffi/src/event/raw.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/raw.rs diff --git a/bindings/nostr-ffi/src/event/tag/kind.rs b/bindings/nostr-sdk-ffi/src/protocol/event/tag/kind.rs similarity index 99% rename from bindings/nostr-ffi/src/event/tag/kind.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/tag/kind.rs index 97ea36d61..bac6ea9c7 100644 --- a/bindings/nostr-ffi/src/event/tag/kind.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/tag/kind.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use nostr::event::tag; use uniffi::Enum; -use crate::SingleLetterTag; +use crate::protocol::SingleLetterTag; #[derive(Enum)] pub enum TagKind { diff --git a/bindings/nostr-ffi/src/event/tag/list.rs b/bindings/nostr-sdk-ffi/src/protocol/event/tag/list.rs similarity index 97% rename from bindings/nostr-ffi/src/event/tag/list.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/tag/list.rs index 337fed87c..f5d51caf6 100644 --- a/bindings/nostr-ffi/src/event/tag/list.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/tag/list.rs @@ -9,8 +9,8 @@ use nostr::event::tag::list; use uniffi::Object; use super::{Tag, TagKind, TagStandard}; -use crate::nips::nip01::Coordinate; -use crate::{EventId, PublicKey, Timestamp}; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::{EventId, PublicKey, Timestamp}; #[derive(Object)] pub struct Tags { diff --git a/bindings/nostr-ffi/src/event/tag/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/event/tag/mod.rs similarity index 96% rename from bindings/nostr-ffi/src/event/tag/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/tag/mod.rs index 874d3e4b0..523911c40 100644 --- a/bindings/nostr-ffi/src/event/tag/mod.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/tag/mod.rs @@ -18,11 +18,11 @@ pub use self::kind::TagKind; pub use self::list::Tags; pub use self::standard::TagStandard; use crate::error::Result; -use crate::nips::nip01::Coordinate; -use crate::nips::nip56::Report; -use crate::nips::nip65::RelayMetadata; -use crate::types::filter::SingleLetterTag; -use crate::{EventId, ImageDimensions, PublicKey, Timestamp}; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::nips::nip56::Report; +use crate::protocol::nips::nip65::RelayMetadata; +use crate::protocol::types::filter::SingleLetterTag; +use crate::protocol::{EventId, ImageDimensions, PublicKey, Timestamp}; /// Tag #[derive(Debug, PartialEq, Eq, Hash, Object)] diff --git a/bindings/nostr-ffi/src/event/tag/standard.rs b/bindings/nostr-sdk-ffi/src/protocol/event/tag/standard.rs similarity index 97% rename from bindings/nostr-ffi/src/event/tag/standard.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/tag/standard.rs index a169701dd..56c25278b 100644 --- a/bindings/nostr-ffi/src/event/tag/standard.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/tag/standard.rs @@ -15,18 +15,18 @@ use nostr::secp256k1::schnorr::Signature; use nostr::{UncheckedUrl, Url}; use uniffi::Enum; -use crate::error::NostrError; -use crate::event::kind::KindEnum; -use crate::nips::nip01::Coordinate; -use crate::nips::nip10::Marker; -use crate::nips::nip39::Identity; -use crate::nips::nip48::Protocol; -use crate::nips::nip53::LiveEventMarker; -use crate::nips::nip56::Report; -use crate::nips::nip65::RelayMetadata; -use crate::nips::nip90::DataVendingMachineStatus; -use crate::nips::nip98::HttpMethod; -use crate::{Event, EventId, ImageDimensions, LiveEventStatus, PublicKey, Timestamp}; +use crate::error::NostrSdkError; +use crate::protocol::event::kind::KindEnum; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::nips::nip10::Marker; +use crate::protocol::nips::nip39::Identity; +use crate::protocol::nips::nip48::Protocol; +use crate::protocol::nips::nip53::LiveEventMarker; +use crate::protocol::nips::nip56::Report; +use crate::protocol::nips::nip65::RelayMetadata; +use crate::protocol::nips::nip90::DataVendingMachineStatus; +use crate::protocol::nips::nip98::HttpMethod; +use crate::protocol::{Event, EventId, ImageDimensions, LiveEventStatus, PublicKey, Timestamp}; /// Standardized tag #[derive(Enum)] @@ -466,7 +466,7 @@ impl From for TagStandard { } impl TryFrom for tag::TagStandard { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: TagStandard) -> crate::error::Result { match value { diff --git a/bindings/nostr-ffi/src/event/unsigned.rs b/bindings/nostr-sdk-ffi/src/protocol/event/unsigned.rs similarity index 95% rename from bindings/nostr-ffi/src/event/unsigned.rs rename to bindings/nostr-sdk-ffi/src/protocol/event/unsigned.rs index d0390f14e..de87b98e2 100644 --- a/bindings/nostr-ffi/src/event/unsigned.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/event/unsigned.rs @@ -12,8 +12,8 @@ use uniffi::Object; use super::EventId; use crate::error::Result; -use crate::signer::{NostrSigner, NostrSignerFFI2Rust}; -use crate::{Event, Keys, Kind, PublicKey, Tag, Timestamp}; +use crate::protocol::signer::{NostrSigner, NostrSignerFFI2Rust}; +use crate::protocol::{Event, Keys, Kind, PublicKey, Tag, Timestamp}; #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/helper.rs b/bindings/nostr-sdk-ffi/src/protocol/helper.rs similarity index 100% rename from bindings/nostr-ffi/src/helper.rs rename to bindings/nostr-sdk-ffi/src/protocol/helper.rs diff --git a/bindings/nostr-ffi/src/key/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/key/mod.rs similarity index 98% rename from bindings/nostr-ffi/src/key/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/key/mod.rs index e08d9c7e2..495d21844 100644 --- a/bindings/nostr-ffi/src/key/mod.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/key/mod.rs @@ -16,8 +16,8 @@ mod secret_key; pub use self::public_key::PublicKey; pub use self::secret_key::SecretKey; use crate::error::Result; -use crate::signer::NostrSigner; -use crate::{Event, UnsignedEvent}; +use crate::protocol::signer::NostrSigner; +use crate::protocol::{Event, UnsignedEvent}; /// Nostr keys #[derive(Debug, PartialEq, Eq, Object)] diff --git a/bindings/nostr-ffi/src/key/public_key.rs b/bindings/nostr-sdk-ffi/src/protocol/key/public_key.rs similarity index 100% rename from bindings/nostr-ffi/src/key/public_key.rs rename to bindings/nostr-sdk-ffi/src/protocol/key/public_key.rs diff --git a/bindings/nostr-ffi/src/key/secret_key.rs b/bindings/nostr-sdk-ffi/src/protocol/key/secret_key.rs similarity index 97% rename from bindings/nostr-ffi/src/key/secret_key.rs rename to bindings/nostr-sdk-ffi/src/protocol/key/secret_key.rs index d61f551cc..793d3be7c 100644 --- a/bindings/nostr-ffi/src/key/secret_key.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/key/secret_key.rs @@ -8,7 +8,7 @@ use nostr::nips::nip19::{FromBech32, ToBech32}; use uniffi::Object; use crate::error::Result; -use crate::nips::nip49::EncryptedSecretKey; +use crate::protocol::nips::nip49::EncryptedSecretKey; #[derive(Debug, PartialEq, Eq, Object)] #[uniffi::export(Debug, Eq)] diff --git a/bindings/nostr-ffi/src/message/client.rs b/bindings/nostr-sdk-ffi/src/protocol/message/client.rs similarity index 99% rename from bindings/nostr-ffi/src/message/client.rs rename to bindings/nostr-sdk-ffi/src/protocol/message/client.rs index 927ce307f..17d6bd05d 100644 --- a/bindings/nostr-ffi/src/message/client.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/message/client.rs @@ -9,8 +9,8 @@ use nostr::{JsonUtil, SubscriptionId}; use uniffi::{Enum, Object}; use crate::error::Result; -use crate::types::filter::Filter; -use crate::Event; +use crate::protocol::types::filter::Filter; +use crate::protocol::Event; /// Messages sent by clients, received by relays #[derive(Enum)] diff --git a/bindings/nostr-ffi/src/message/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/message/mod.rs similarity index 100% rename from bindings/nostr-ffi/src/message/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/message/mod.rs diff --git a/bindings/nostr-ffi/src/message/relay.rs b/bindings/nostr-sdk-ffi/src/protocol/message/relay.rs similarity index 99% rename from bindings/nostr-ffi/src/message/relay.rs rename to bindings/nostr-sdk-ffi/src/protocol/message/relay.rs index 42b6d4bd6..97bad315d 100644 --- a/bindings/nostr-ffi/src/message/relay.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/message/relay.rs @@ -10,7 +10,7 @@ use nostr::{JsonUtil, SubscriptionId}; use uniffi::{Enum, Object}; use crate::error::Result; -use crate::{Event, EventId}; +use crate::protocol::{Event, EventId}; #[derive(Enum)] pub enum RelayMessageEnum { diff --git a/bindings/nostr-sdk-ffi/src/protocol/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/mod.rs new file mode 100644 index 000000000..8cbba7c62 --- /dev/null +++ b/bindings/nostr-sdk-ffi/src/protocol/mod.rs @@ -0,0 +1,27 @@ +// Copyright (c) 2022-2023 Yuki Kishimoto +// Copyright (c) 2023-2024 Rust Nostr Developers +// Distributed under the MIT software license + +pub mod event; +pub mod helper; +pub mod key; +pub mod message; +pub mod nips; +pub mod signer; +pub mod types; +pub mod util; + +pub use self::event::{Event, EventBuilder, EventId, Kind, KindEnum, Tag, TagKind, UnsignedEvent}; +pub use self::key::{Keys, PublicKey, SecretKey}; +pub use self::message::{ClientMessage, ClientMessageEnum, RelayMessage, RelayMessageEnum}; +pub use self::nips::nip04::{nip04_decrypt, nip04_encrypt}; +pub use self::nips::nip05::{get_nip05_profile, verify_nip05}; +pub use self::nips::nip11::RelayInformationDocument; +pub use self::nips::nip46::{NostrConnectMessage, NostrConnectMetadata, NostrConnectURI}; +pub use self::nips::nip53::{Image, LiveEvent, LiveEventHost, LiveEventStatus, Person}; +pub use self::nips::nip65::RelayMetadata; +pub use self::nips::nip94::FileMetadata; +pub use self::types::{ + Alphabet, Contact, Filter, ImageDimensions, Metadata, SingleLetterTag, Timestamp, +}; +pub use self::util::{generate_shared_key, JsonValue}; diff --git a/bindings/nostr-ffi/src/nips/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/mod.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/mod.rs diff --git a/bindings/nostr-ffi/src/nips/nip01.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip01.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip01.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip01.rs index 150e079e5..e0d3958ee 100644 --- a/bindings/nostr-ffi/src/nips/nip01.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip01.rs @@ -12,7 +12,7 @@ use nostr::nips::nip21::NostrURI; use uniffi::Object; use crate::error::Result; -use crate::{Kind, PublicKey}; +use crate::protocol::{Kind, PublicKey}; /// Coordinate for event (`a` tag) #[derive(Debug, PartialEq, Eq, Hash, Object)] diff --git a/bindings/nostr-ffi/src/nips/nip04.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip04.rs similarity index 94% rename from bindings/nostr-ffi/src/nips/nip04.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip04.rs index 7fe4c2205..05949d08d 100644 --- a/bindings/nostr-ffi/src/nips/nip04.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip04.rs @@ -7,7 +7,7 @@ use std::ops::Deref; use nostr::nips::nip04; use crate::error::Result; -use crate::{PublicKey, SecretKey}; +use crate::protocol::{PublicKey, SecretKey}; #[uniffi::export] pub fn nip04_encrypt( diff --git a/bindings/nostr-ffi/src/nips/nip05.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip05.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip05.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip05.rs index cbe85d4f8..3adfafc5c 100644 --- a/bindings/nostr-ffi/src/nips/nip05.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip05.rs @@ -10,7 +10,7 @@ use nostr::nips::nip05; use uniffi::Object; use crate::error::Result; -use crate::PublicKey; +use crate::protocol::PublicKey; #[derive(Object)] pub struct Nip05Profile { diff --git a/bindings/nostr-ffi/src/nips/nip10.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip10.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip10.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip10.rs diff --git a/bindings/nostr-ffi/src/nips/nip11.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip11.rs similarity index 99% rename from bindings/nostr-ffi/src/nips/nip11.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip11.rs index ed3d322f0..07a273307 100644 --- a/bindings/nostr-ffi/src/nips/nip11.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip11.rs @@ -10,7 +10,7 @@ use nostr::Url; use uniffi::{Enum, Object, Record}; use crate::error::Result; -use crate::Timestamp; +use crate::protocol::Timestamp; #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/nips/nip13.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip13.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip13.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip13.rs diff --git a/bindings/nostr-ffi/src/nips/nip15.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip15.rs similarity index 99% rename from bindings/nostr-ffi/src/nips/nip15.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip15.rs index 362fe32bf..685e566fa 100644 --- a/bindings/nostr-ffi/src/nips/nip15.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip15.rs @@ -9,7 +9,7 @@ use nostr::JsonUtil; use uniffi::{Object, Record}; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; +use crate::protocol::helper::unwrap_or_clone_arc; /// Payload for creating or updating stall #[derive(Record)] diff --git a/bindings/nostr-ffi/src/nips/nip19.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip19.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip19.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip19.rs index c6be1ca39..80f4d6522 100644 --- a/bindings/nostr-ffi/src/nips/nip19.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip19.rs @@ -11,7 +11,7 @@ use uniffi::{Enum, Object}; use super::nip01::Coordinate; use super::nip49::EncryptedSecretKey; use crate::error::Result; -use crate::{EventId, Kind, PublicKey, SecretKey}; +use crate::protocol::{EventId, Kind, PublicKey, SecretKey}; /// A representation any `NIP19` bech32 nostr object. Useful for decoding /// `NIP19` bech32 strings without necessarily knowing what you're decoding diff --git a/bindings/nostr-ffi/src/nips/nip21.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip21.rs similarity index 93% rename from bindings/nostr-ffi/src/nips/nip21.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip21.rs index 1a8aa07ec..bb351c424 100644 --- a/bindings/nostr-ffi/src/nips/nip21.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip21.rs @@ -7,9 +7,9 @@ use nostr::nips::nip21; use uniffi::{Enum, Object}; use crate::error::Result; -use crate::nips::nip01::Coordinate; -use crate::nips::nip19::{Nip19Event, Nip19Profile}; -use crate::{EventId, PublicKey}; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::nips::nip19::{Nip19Event, Nip19Profile}; +use crate::protocol::{EventId, PublicKey}; /// A representation any `NIP21` object. Useful for decoding /// `NIP21` strings without necessarily knowing what you're decoding diff --git a/bindings/nostr-ffi/src/nips/nip26.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip26.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip26.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip26.rs index 83521c194..7cd3f3e7a 100644 --- a/bindings/nostr-ffi/src/nips/nip26.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip26.rs @@ -8,7 +8,7 @@ use nostr::nips::nip26::{self, Conditions, DelegationTag, EventProperties}; use nostr::secp256k1::schnorr::Signature; use crate::error::Result; -use crate::{Keys, Kind, PublicKey}; +use crate::protocol::{Keys, Kind, PublicKey}; /// Create a NIP26 delegation tag (including the signature). /// See also validate_delegation_tag(). diff --git a/bindings/nostr-ffi/src/nips/nip34.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip34.rs similarity index 96% rename from bindings/nostr-ffi/src/nips/nip34.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip34.rs index 039f07565..1828d28c4 100644 --- a/bindings/nostr-ffi/src/nips/nip34.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip34.rs @@ -11,9 +11,9 @@ use nostr::nips::nip34; use nostr::Url; use uniffi::{Enum, Record}; -use crate::error::NostrError; -use crate::nips::nip01::Coordinate; -use crate::{EventId, PublicKey, Timestamp}; +use crate::error::NostrSdkError; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::{EventId, PublicKey, Timestamp}; /// Git Repository Announcement /// @@ -152,7 +152,7 @@ pub enum GitPatchContent { } impl TryFrom for nip34::GitPatchContent { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: GitPatchContent) -> Result { match value { @@ -200,7 +200,7 @@ pub struct GitPatch { } impl TryFrom for nip34::GitPatch { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: GitPatch) -> Result { Ok(Self { diff --git a/bindings/nostr-ffi/src/nips/nip39.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip39.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip39.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip39.rs diff --git a/bindings/nostr-ffi/src/nips/nip44.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip44.rs similarity index 96% rename from bindings/nostr-ffi/src/nips/nip44.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip44.rs index a727fa5b6..02d5f2dab 100644 --- a/bindings/nostr-ffi/src/nips/nip44.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip44.rs @@ -8,7 +8,7 @@ use nostr::nips::nip44::{self, Version}; use uniffi::Enum; use crate::error::Result; -use crate::{PublicKey, SecretKey}; +use crate::protocol::{PublicKey, SecretKey}; /// NIP44 Version #[derive(Enum)] diff --git a/bindings/nostr-ffi/src/nips/nip46.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip46.rs similarity index 97% rename from bindings/nostr-ffi/src/nips/nip46.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip46.rs index e6c30290b..ee35b434e 100644 --- a/bindings/nostr-ffi/src/nips/nip46.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip46.rs @@ -10,9 +10,9 @@ use nostr::nips::nip46::{self, Method, Request, ResponseResult}; use nostr::{JsonUtil, Url}; use uniffi::{Enum, Object}; -use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::{NostrError, PublicKey, UnsignedEvent}; +use crate::error::{NostrSdkError, Result}; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::{PublicKey, UnsignedEvent}; /// Request (NIP46) #[derive(Enum)] @@ -206,7 +206,7 @@ pub enum NostrConnectMessage { } impl TryFrom for nip46::Message { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: NostrConnectMessage) -> Result { Ok(match value { diff --git a/bindings/nostr-ffi/src/nips/nip47.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip47.rs similarity index 99% rename from bindings/nostr-ffi/src/nips/nip47.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip47.rs index e9ff0d9b6..4e43ace3b 100644 --- a/bindings/nostr-ffi/src/nips/nip47.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip47.rs @@ -10,7 +10,7 @@ use nostr::{JsonUtil, Url}; use uniffi::{Enum, Object, Record}; use crate::error::Result; -use crate::{JsonValue, PublicKey, SecretKey, Timestamp}; +use crate::protocol::{JsonValue, PublicKey, SecretKey, Timestamp}; /// NIP47 Response Error codes #[derive(Enum)] diff --git a/bindings/nostr-ffi/src/nips/nip48.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip48.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip48.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip48.rs diff --git a/bindings/nostr-ffi/src/nips/nip49.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip49.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip49.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip49.rs index 99589f878..9730c8ce9 100644 --- a/bindings/nostr-ffi/src/nips/nip49.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip49.rs @@ -10,7 +10,7 @@ use nostr::{FromBech32, ToBech32}; use uniffi::{Enum, Object}; use crate::error::Result; -use crate::SecretKey; +use crate::protocol::SecretKey; /// Encrypted Secret Key version (NIP49) #[derive(Enum)] diff --git a/bindings/nostr-ffi/src/nips/nip51.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip51.rs similarity index 97% rename from bindings/nostr-ffi/src/nips/nip51.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip51.rs index cba5f7e39..b0adbe29a 100644 --- a/bindings/nostr-ffi/src/nips/nip51.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip51.rs @@ -10,8 +10,8 @@ use nostr::{UncheckedUrl, Url}; use uniffi::Record; use super::nip01::Coordinate; -use crate::error::Result; -use crate::{EventId, NostrError, PublicKey}; +use crate::error::{NostrSdkError, Result}; +use crate::protocol::{EventId, PublicKey}; /// Things the user doesn't want to see in their feeds /// @@ -55,7 +55,7 @@ pub struct Bookmarks { } impl TryFrom for nip51::Bookmarks { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: Bookmarks) -> Result { let mut url_list: Vec = Vec::with_capacity(value.urls.len()); diff --git a/bindings/nostr-ffi/src/nips/nip53.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip53.rs similarity index 98% rename from bindings/nostr-ffi/src/nips/nip53.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip53.rs index 7ebdb0030..dd4fad778 100644 --- a/bindings/nostr-ffi/src/nips/nip53.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip53.rs @@ -9,7 +9,7 @@ use nostr::secp256k1::schnorr::Signature; use nostr::types::url::{UncheckedUrl, Url}; use uniffi::{Enum, Record}; -use crate::{ImageDimensions, PublicKey, Timestamp}; +use crate::protocol::{ImageDimensions, PublicKey, Timestamp}; #[derive(Enum)] /// Live Event Marker diff --git a/bindings/nostr-ffi/src/nips/nip56.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip56.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip56.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip56.rs diff --git a/bindings/nostr-ffi/src/nips/nip57.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip57.rs similarity index 96% rename from bindings/nostr-ffi/src/nips/nip57.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip57.rs index 7e82eab16..03e549668 100644 --- a/bindings/nostr-ffi/src/nips/nip57.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip57.rs @@ -10,8 +10,8 @@ use nostr::Url; use uniffi::{Enum, Object}; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::{Event, EventId, Keys, PublicKey, SecretKey}; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::{Event, EventId, Keys, PublicKey, SecretKey}; #[derive(Enum)] pub enum ZapType { diff --git a/bindings/nostr-ffi/src/nips/nip59.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip59.rs similarity index 94% rename from bindings/nostr-ffi/src/nips/nip59.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip59.rs index ecb69866a..39de484f9 100644 --- a/bindings/nostr-ffi/src/nips/nip59.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip59.rs @@ -9,8 +9,8 @@ use nostr::EventBuilder; use uniffi::Object; use crate::error::Result; -use crate::signer::{NostrSigner, NostrSignerFFI2Rust}; -use crate::{Event, PublicKey, Timestamp, UnsignedEvent}; +use crate::protocol::signer::{NostrSigner, NostrSignerFFI2Rust}; +use crate::protocol::{Event, PublicKey, Timestamp, UnsignedEvent}; /// Build Gift Wrap /// diff --git a/bindings/nostr-ffi/src/nips/nip65.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip65.rs similarity index 97% rename from bindings/nostr-ffi/src/nips/nip65.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip65.rs index d6b3f8c41..cf3d18d33 100644 --- a/bindings/nostr-ffi/src/nips/nip65.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip65.rs @@ -7,7 +7,7 @@ use std::ops::Deref; use nostr::nips::nip65; use uniffi::Enum; -use crate::Event; +use crate::protocol::Event; #[derive(Enum)] pub enum RelayMetadata { diff --git a/bindings/nostr-ffi/src/nips/nip90.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip90.rs similarity index 97% rename from bindings/nostr-ffi/src/nips/nip90.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip90.rs index dfd4d5083..fe5e9ccbb 100644 --- a/bindings/nostr-ffi/src/nips/nip90.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip90.rs @@ -7,8 +7,8 @@ use std::sync::Arc; use nostr::nips::nip90; use uniffi::{Enum, Object}; -use crate::helper::unwrap_or_clone_arc; -use crate::Event; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::Event; #[derive(Enum)] pub enum DataVendingMachineStatus { diff --git a/bindings/nostr-ffi/src/nips/nip94.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip94.rs similarity index 96% rename from bindings/nostr-ffi/src/nips/nip94.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip94.rs index ea323e1fd..a28003ce8 100644 --- a/bindings/nostr-ffi/src/nips/nip94.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/nips/nip94.rs @@ -12,8 +12,8 @@ use nostr::Url; use uniffi::Object; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::ImageDimensions; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::ImageDimensions; #[derive(Debug, Clone, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/nips/nip98.rs b/bindings/nostr-sdk-ffi/src/protocol/nips/nip98.rs similarity index 100% rename from bindings/nostr-ffi/src/nips/nip98.rs rename to bindings/nostr-sdk-ffi/src/protocol/nips/nip98.rs diff --git a/bindings/nostr-ffi/src/signer.rs b/bindings/nostr-sdk-ffi/src/protocol/signer.rs similarity index 95% rename from bindings/nostr-ffi/src/signer.rs rename to bindings/nostr-sdk-ffi/src/protocol/signer.rs index 2e0fae188..3984591b6 100644 --- a/bindings/nostr-ffi/src/signer.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/signer.rs @@ -6,9 +6,9 @@ use std::fmt; use std::ops::Deref; use std::sync::Arc; +use super::event::{Event, UnsignedEvent}; +use super::key::PublicKey; use crate::error::Result; -use crate::event::{Event, UnsignedEvent}; -use crate::key::PublicKey; // NOTE: for some weird reason the `Arc` as output must be wrapped inside a `Vec` or an `Option` // otherwise compilation will fail. @@ -120,7 +120,7 @@ mod inner { use nostr::prelude::*; use super::NostrSignerFFI2Rust; - use crate::NostrError; + use crate::error::NostrSdkError; #[async_trait] impl NostrSigner for NostrSignerFFI2Rust { @@ -131,7 +131,7 @@ mod inner { .await .map_err(SignerError::backend)? .ok_or_else(|| { - SignerError::backend(NostrError::Generic(String::from( + SignerError::backend(NostrSdkError::Generic(String::from( "Received None instead of public key", ))) })?; @@ -146,7 +146,7 @@ mod inner { .await .map_err(SignerError::backend)? .ok_or_else(|| { - SignerError::backend(NostrError::Generic(String::from( + SignerError::backend(NostrSdkError::Generic(String::from( "Received None instead of event", ))) })?; diff --git a/bindings/nostr-ffi/src/types/contact.rs b/bindings/nostr-sdk-ffi/src/protocol/types/contact.rs similarity index 97% rename from bindings/nostr-ffi/src/types/contact.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/contact.rs index d4b2f205a..0c984cf8b 100644 --- a/bindings/nostr-ffi/src/types/contact.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/types/contact.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use nostr::UncheckedUrl; use uniffi::Object; -use crate::PublicKey; +use crate::protocol::PublicKey; #[derive(Debug, PartialEq, Eq, Hash, Object)] #[uniffi::export(Debug, Eq, Hash)] diff --git a/bindings/nostr-ffi/src/types/filter.rs b/bindings/nostr-sdk-ffi/src/protocol/types/filter.rs similarity index 98% rename from bindings/nostr-ffi/src/types/filter.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/filter.rs index c0a22b432..5130db9f5 100644 --- a/bindings/nostr-ffi/src/types/filter.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/types/filter.rs @@ -10,9 +10,9 @@ use nostr::JsonUtil; use uniffi::{Enum, Object, Record}; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::nips::nip01::Coordinate; -use crate::{Event, EventId, Kind, PublicKey, Timestamp}; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::nips::nip01::Coordinate; +use crate::protocol::{Event, EventId, Kind, PublicKey, Timestamp}; #[derive(Enum)] pub enum Alphabet { diff --git a/bindings/nostr-ffi/src/types/image.rs b/bindings/nostr-sdk-ffi/src/protocol/types/image.rs similarity index 100% rename from bindings/nostr-ffi/src/types/image.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/image.rs diff --git a/bindings/nostr-ffi/src/types/metadata.rs b/bindings/nostr-sdk-ffi/src/protocol/types/metadata.rs similarity index 98% rename from bindings/nostr-ffi/src/types/metadata.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/metadata.rs index ea83d5cb0..3c8c0b723 100644 --- a/bindings/nostr-ffi/src/types/metadata.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/types/metadata.rs @@ -10,8 +10,8 @@ use nostr::{JsonUtil, Url}; use uniffi::{Object, Record}; use crate::error::Result; -use crate::helper::unwrap_or_clone_arc; -use crate::JsonValue; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::JsonValue; #[derive(Record)] pub struct MetadataRecord { diff --git a/bindings/nostr-ffi/src/types/mod.rs b/bindings/nostr-sdk-ffi/src/protocol/types/mod.rs similarity index 100% rename from bindings/nostr-ffi/src/types/mod.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/mod.rs diff --git a/bindings/nostr-ffi/src/types/time.rs b/bindings/nostr-sdk-ffi/src/protocol/types/time.rs similarity index 100% rename from bindings/nostr-ffi/src/types/time.rs rename to bindings/nostr-sdk-ffi/src/protocol/types/time.rs diff --git a/bindings/nostr-ffi/src/util.rs b/bindings/nostr-sdk-ffi/src/protocol/util.rs similarity index 90% rename from bindings/nostr-ffi/src/util.rs rename to bindings/nostr-sdk-ffi/src/protocol/util.rs index 5a621430b..6206a7e19 100644 --- a/bindings/nostr-ffi/src/util.rs +++ b/bindings/nostr-sdk-ffi/src/protocol/util.rs @@ -9,8 +9,8 @@ use nostr::serde_json::{Number, Value}; use nostr::util; use uniffi::Enum; -use crate::error::Result; -use crate::{NostrError, PublicKey, SecretKey}; +use super::{PublicKey, SecretKey}; +use crate::error::{NostrSdkError, Result}; /// Generate shared key /// @@ -34,7 +34,7 @@ pub enum JsonValue { } impl TryFrom for Value { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: JsonValue) -> Result { Ok(match value { @@ -42,9 +42,9 @@ impl TryFrom for Value { JsonValue::NumberPosInt { number } => Self::Number(Number::from(number)), JsonValue::NumberNegInt { number } => Self::Number(Number::from(number)), JsonValue::NumberFloat { number } => { - let float = Number::from_f64(number).ok_or(NostrError::Generic(String::from( - "Impossible to convert finite f64 to number", - )))?; + let float = Number::from_f64(number).ok_or(NostrSdkError::Generic( + String::from("Impossible to convert finite f64 to number"), + ))?; Self::Number(float) } JsonValue::Str { s } => Self::String(s), @@ -65,7 +65,7 @@ impl TryFrom for Value { } impl TryFrom for JsonValue { - type Error = NostrError; + type Error = NostrSdkError; fn try_from(value: Value) -> Result { Ok(match value { @@ -77,7 +77,7 @@ impl TryFrom for JsonValue { None => match number.as_f64() { Some(number) => Self::NumberFloat { number }, None => { - return Err(NostrError::Generic(String::from( + return Err(NostrSdkError::Generic(String::from( "Impossible to convert number", ))) } diff --git a/bindings/nostr-sdk-ffi/src/relay/filtering.rs b/bindings/nostr-sdk-ffi/src/relay/filtering.rs index 6fe2a39b2..07e928522 100644 --- a/bindings/nostr-sdk-ffi/src/relay/filtering.rs +++ b/bindings/nostr-sdk-ffi/src/relay/filtering.rs @@ -5,10 +5,11 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::{EventId, PublicKey}; use nostr_sdk::pool::relay; use uniffi::{Enum, Object}; +use crate::protocol::{EventId, PublicKey}; + #[derive(Enum)] pub enum RelayFilteringMode { /// Only the matching values will be allowed diff --git a/bindings/nostr-sdk-ffi/src/relay/limits.rs b/bindings/nostr-sdk-ffi/src/relay/limits.rs index 1dbd6ff31..960beef4a 100644 --- a/bindings/nostr-sdk-ffi/src/relay/limits.rs +++ b/bindings/nostr-sdk-ffi/src/relay/limits.rs @@ -5,11 +5,12 @@ use std::ops::Deref; use std::sync::Arc; -use nostr_ffi::helper::unwrap_or_clone_arc; -use nostr_ffi::Kind; use nostr_sdk::pool::relay; use uniffi::Object; +use crate::protocol::helper::unwrap_or_clone_arc; +use crate::protocol::Kind; + /// Relay Limits #[derive(Debug, Clone, PartialEq, Eq, Object)] #[uniffi::export(Debug, Eq)] diff --git a/bindings/nostr-sdk-ffi/src/relay/mod.rs b/bindings/nostr-sdk-ffi/src/relay/mod.rs index 7fb8aedbc..015a0d168 100644 --- a/bindings/nostr-sdk-ffi/src/relay/mod.rs +++ b/bindings/nostr-sdk-ffi/src/relay/mod.rs @@ -7,13 +7,10 @@ use std::ops::Deref; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::{ClientMessage, Event, EventId, Filter, RelayInformationDocument}; use nostr_sdk::database::DynNostrDatabase; use nostr_sdk::{pool, FilterOptions, SubscriptionId, Url}; use uniffi::{Object, Record}; -use crate::database::events::Events; - pub mod filtering; pub mod limits; pub mod options; @@ -26,8 +23,10 @@ use self::options::SyncOptions; pub use self::options::{ConnectionMode, RelayOptions, RelaySendOptions, SubscribeOptions}; pub use self::stats::RelayConnectionStats; pub use self::status::RelayStatus; +use crate::database::events::Events; use crate::error::Result; use crate::negentropy::NegentropyItem; +use crate::protocol::{ClientMessage, Event, EventId, Filter, RelayInformationDocument}; use crate::NostrDatabase; #[derive(Record)] diff --git a/bindings/nostr-sdk-ffi/src/relay/options.rs b/bindings/nostr-sdk-ffi/src/relay/options.rs index 187de6704..2a0de7fcf 100644 --- a/bindings/nostr-sdk-ffi/src/relay/options.rs +++ b/bindings/nostr-sdk-ffi/src/relay/options.rs @@ -7,12 +7,12 @@ use std::path::PathBuf; use std::sync::Arc; use std::time::Duration; -use nostr_ffi::helper::unwrap_or_clone_arc; use nostr_sdk::pool; use uniffi::{Enum, Object}; use super::{RelayFilteringMode, RelayLimits}; use crate::error::{NostrSdkError, Result}; +use crate::protocol::helper::unwrap_or_clone_arc; #[derive(Enum)] pub enum ConnectionMode { diff --git a/bindings/nostr-sdk-ffi/src/relay/stats.rs b/bindings/nostr-sdk-ffi/src/relay/stats.rs index 8ee17aec0..10195eb11 100644 --- a/bindings/nostr-sdk-ffi/src/relay/stats.rs +++ b/bindings/nostr-sdk-ffi/src/relay/stats.rs @@ -4,10 +4,11 @@ use std::time::Duration; -use nostr_ffi::Timestamp; use nostr_sdk::pool; use uniffi::Object; +use crate::protocol::Timestamp; + #[derive(Object)] pub struct RelayConnectionStats { inner: pool::RelayConnectionStats, diff --git a/bindings/nostr-ffi/tests/test_equality.py b/bindings/nostr-sdk-ffi/tests/test_equality.py similarity index 95% rename from bindings/nostr-ffi/tests/test_equality.py rename to bindings/nostr-sdk-ffi/tests/test_equality.py index 8236ac7ef..b8bb08fdc 100644 --- a/bindings/nostr-ffi/tests/test_equality.py +++ b/bindings/nostr-sdk-ffi/tests/test_equality.py @@ -1,4 +1,4 @@ -from nostr_ffi import * +from nostr_sdk_ffi import * # Test PublicKey pk1 = PublicKey.from_hex("b2d670de53b27691c0c3400225b65c35a26d06093bcc41f48ffc71e0907f9d4a") diff --git a/bindings/nostr-ffi/tests/test_generated_bindings.rs b/bindings/nostr-sdk-ffi/tests/test_generated_bindings.rs similarity index 100% rename from bindings/nostr-ffi/tests/test_generated_bindings.rs rename to bindings/nostr-sdk-ffi/tests/test_generated_bindings.rs diff --git a/bindings/nostr-ffi/tests/test_nip05.py b/bindings/nostr-sdk-ffi/tests/test_nip05.py similarity index 94% rename from bindings/nostr-ffi/tests/test_nip05.py rename to bindings/nostr-sdk-ffi/tests/test_nip05.py index 5cfd97cf3..502a5f0f6 100644 --- a/bindings/nostr-ffi/tests/test_nip05.py +++ b/bindings/nostr-sdk-ffi/tests/test_nip05.py @@ -1,5 +1,5 @@ import asyncio -from nostr_ffi import * +from nostr_sdk_ffi import * async def main(): nip_05 = "yuki@yukikishimoto.com" diff --git a/bindings/nostr-ffi/tests/test_to_string.py b/bindings/nostr-sdk-ffi/tests/test_to_string.py similarity index 89% rename from bindings/nostr-ffi/tests/test_to_string.py rename to bindings/nostr-sdk-ffi/tests/test_to_string.py index d0aea341c..e09435f97 100644 --- a/bindings/nostr-ffi/tests/test_to_string.py +++ b/bindings/nostr-sdk-ffi/tests/test_to_string.py @@ -1,4 +1,4 @@ -from nostr_ffi import * +from nostr_sdk_ffi import * addr = "30023:aa4fc8665f5696e33db7e1a572e3b0f5b3d615837b0f362dcb1c8068b098c7b4:ipsum" coordinate = Coordinate.parse(addr) diff --git a/contrib/scripts/check-bindings.sh b/contrib/scripts/check-bindings.sh index 6454cb909..cab157a31 100755 --- a/contrib/scripts/check-bindings.sh +++ b/contrib/scripts/check-bindings.sh @@ -4,7 +4,6 @@ set -euo pipefail # Check bindings buildargs=( - "-p nostr-ffi" "-p nostr-sdk-ffi" "-p nostr-sdk-js --target wasm32-unknown-unknown" )