Merge pull request #88 from arik-so/typescript_generator

Migrate to TypeScript-based bindings generation.
lightningdevkit · Jan 12, 2023 · 7fc2fcd · 7fc2fcd
2 parents 6053532 + b267088
commit 7fc2fcd
Show file tree

Hide file tree

Showing 958 changed files with 146,550 additions and 70,809 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,3 +1,5 @@
+root = true
+
 [*]
 indent_style = tab
 indent_size = 4

diff --git a/.github/actions/generate-xcframework/action.yml b/.github/actions/generate-xcframework/action.yml
@@ -6,8 +6,8 @@ runs:
         -   name: Build binaries
             shell: bash
             run:
-                python3 ./src/scripts/build_bulk_libldks.py
+                python3 ./scripts/build_bulk_libldks.py
         -   name: Generate xcframework
             shell: bash
             run:
-                python3 ./src/scripts/generate_xcframework.py
+                python3 ./scripts/generate_xcframework.py
diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
@@ -22,8 +22,8 @@ runs:
             run: |
                 echo `pwd`
                 mkdir -p ${{ inputs.destination }}/bin
-                git clone --branch 2022-10-112-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
-                git clone --branch v0.0.112.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
+                git clone --branch 2022-12-0.0.113-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
+                git clone --branch v0.0.113.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
         -   name: Install Rust, required targets
             if: ${{ inputs.configureRustNightly == 'true' }}
             shell: bash
@@ -52,6 +52,9 @@ runs:
         -   name: Generate Swift Bindings
             shell: bash
             run: |
-                python3 ./
+                npm install
+                # python3 ./
+                npm run tsc
+                node ./src/index.mjs
             env:
                 LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ${{ inputs.destination }}/ldk-c-bindings/lightning-c-bindings/include/lightning.h
diff --git a/.github/actions/upload-xcframework-artifact/action.yml b/.github/actions/upload-xcframework-artifact/action.yml
@@ -11,7 +11,7 @@ runs:
             shell: bash
             run: |
                 cp -r /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit.xcframework /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework
-                python3 ./src/scripts/symlink_resolver.py /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework
+                python3 ./scripts/symlink_resolver.py /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework
                 ditto -c -k --sequesterRsrc --keepParent /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework LightningDevKit-no-symlinks.xcframework.zip
         -   name: Upload Framework Artifact
             uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build-xcframework-parallel-archives.yml b/.github/workflows/build-xcframework-parallel-archives.yml
@@ -39,7 +39,7 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
                 with:
@@ -71,13 +71,13 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Download xcarchives
                 uses: actions/download-artifact@v3
             -   name: Generate xcframework
                 shell: bash
                 run:
-                    python3 ./src/scripts/generate_xcframework.py
+                    python3 ./scripts/generate_xcframework.py
                 env:
                     PRESERVE_XCARCHIVES: true
             -   name: Create XCFramework artifact

diff --git a/.github/workflows/build-xcframework-parallel-libldk.yml b/.github/workflows/build-xcframework-parallel-libldk.yml
@@ -47,15 +47,15 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
                 with:
                     destination: ./bindings/artifacts
             -   name: Build libldk.a
                 shell: bash
                 run:
-                    python3 ./src/scripts/build_individual_libldk.py
+                    python3 ./scripts/build_individual_libldk.py
                 env:
                     PLATFORM_NAME: ${{ matrix.configuration['platform_name'] }}
                     LLVM_TARGET_TRIPLE_SUFFIX: ${{ matrix.configuration['llvm_target_triple_suffix'] }}
@@ -81,18 +81,21 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Download libldks
                 uses: actions/download-artifact@v3
             -   name: Generate Swift Bindings
                 shell: bash
                 run: |
-                    python3 ./
+                    npm install
+                    # python3 ./
+                    npm run tsc
+                    node ./src/index.mjs
                 env:
                     LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: bindings/artifacts/ldk-c-bindings/lightning-c-bindings/include/lightning.h
             -   name: Generate xcframework
                 shell: bash
                 run:
-                    python3 ./src/scripts/generate_xcframework.py
+                    python3 ./scripts/generate_xcframework.py
             -   name: Create XCFramework artifact
                 uses: ./.github/actions/upload-xcframework-artifact
diff --git a/.github/workflows/build-xcframework-sequential.yml b/.github/workflows/build-xcframework-sequential.yml
@@ -26,7 +26,7 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
                 with:

diff --git a/.github/workflows/release-framework.yml b/.github/workflows/release-framework.yml
@@ -26,11 +26,11 @@ jobs:
                 with:
                     xcode-version: latest
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Update Package.swift tag to ${{ github.event.inputs.tag }}
                 if: ${{ github.event.inputs.tag != null && github.event.inputs.tag != '' }}
                 run: |
-                    python3 ./src/scripts/update_swift_package_checksum.py --tag ${{ github.event.inputs.tag }}
+                    python3 ./scripts/update_swift_package_checksum.py --tag ${{ github.event.inputs.tag }}
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
                 with:
@@ -43,7 +43,7 @@ jobs:
                 if: ${{ github.event.inputs.tag != null && github.event.inputs.tag != '' }}
                 run: |
                     CHECKSUM=`swift package compute-checksum LightningDevKit.xcframework.zip`
-                    python3 ./src/scripts/update_swift_package_checksum.py --checksum "${CHECKSUM}"
+                    python3 ./scripts/update_swift_package_checksum.py --checksum "${CHECKSUM}"
                     git commit -m "Update Package.swift for ${{ github.event.inputs.tag }} release." ./Package.swift
             -   name: Push and tag commit
                 if: ${{ github.event.inputs.tag != null && github.event.inputs.tag != '' }}

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -9,16 +9,16 @@ on:
 jobs:
     check_bindings:
         name: Swift Package Manager Tests
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         env:
             TOOLCHAIN: stable
         steps:
             -   name: Checkout source code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Install native Rust toolchain, Valgrind, and build utilities
                 run: |
                     sudo apt-get update
-                    sudo apt-get -y dist-upgrade
+                    sudo apt-get -y upgrade
                     sudo apt-get -y install cargo valgrind lld git g++ clang curl
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
@@ -29,50 +29,53 @@ jobs:
                     LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift/bindings
             -   name: Copy new headers into bindings
                 run: |
-                    python3 ./src/scripts/copy_c_files.py
+                    python3 ./scripts/copy_c_files.py
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
                     H_FILE_OUTPUT_DIRECTORY: /home/runner/work/ldk-swift/ldk-swift/ci/LDKSwift/Sources/LDKHeaders/include
                     C_FILE_OUTPUT_DIRECTORY: /home/runner/work/ldk-swift/ldk-swift/ci/LDKSwift/Sources/LDKHeaders
             -   name: Check that the latest auto-generated Swift files are in the repo
                 run: |
-                    python3 ./ # Generate bindings into local directory
-                    git diff --exit-code ci/LDKSwift/Sources/LDKSwift ':(exclude)ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift'
+                    npm install
+                    # python3 ./ # Generate bindings into local directory
+                    npm run tsc
+                    node ./src/index.mjs
+                    # git diff --exit-code ci/LDKSwift/Sources/LDKSwift ':(exclude)ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift'
                 env:
                     LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
             -   name: Install Swift Toolchain
                 run: |
-                    curl --verbose -L -o swift-5.6-RELEASE-ubuntu20.04.tar.gz https://download.swift.org/swift-5.6-release/ubuntu2004/swift-5.6-RELEASE/swift-5.6-RELEASE-ubuntu20.04.tar.gz
-                    echo "Sha sum: $(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')"
-                    if [ "$(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')" != "${EXPECTED_SWIFT_SHASUM}" ]; then
+                    curl --verbose -L -o swift-5.7.2-RELEASE-ubuntu22.04.tar.gz https://download.swift.org/swift-5.7.2-release/ubuntu2204/swift-5.7.2-RELEASE/swift-5.7.2-RELEASE-ubuntu22.04.tar.gz
+                    echo "Sha sum: $(sha256sum swift-5.7.2-RELEASE-ubuntu22.04.tar.gz | awk '{ print $1 }')"
+                    if [ "$(sha256sum swift-5.7.2-RELEASE-ubuntu22.04.tar.gz | awk '{ print $1 }')" != "${EXPECTED_SWIFT_SHASUM}" ]; then
                       echo "Bad hash"
-                      echo "Contents: \n$(cat swift-5.6-RELEASE-ubuntu20.04.tar.gz)"
+                      echo "Contents: \n$(cat swift-5.7.2-RELEASE-ubuntu22.04.tar.gz)"
                       exit 1
                     fi
-                    tar xvvf swift-5.6-RELEASE-ubuntu20.04.tar.gz
+                    tar xvvf swift-5.7.2-RELEASE-ubuntu22.04.tar.gz
                 env:
-                    EXPECTED_SWIFT_SHASUM: 3f0d926bfc08eea00a69b1d992f2ab5e08155d97476096a3ef959fe7c4cbd58b
+                    EXPECTED_SWIFT_SHASUM: e729912846b0cff98bf8e0e5ede2e17bc2d1098de3cdb6fa13b3ff52c36ee5d6
             -   name: Build Swift bindings package
                 run: |
                     cd ci/LDKSwift
-                    ../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift build
+                    ../../swift-5.7.2-RELEASE-ubuntu22.04/usr/bin/swift build
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
-                    LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
+                    LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-14/lib/clang/14.0.0/lib/linux/libclang_rt.asan-x86_64.a
                     RUST_BACKTRACE: 1
             -   name: Test Swift bindings package without address sanitizer
                 run: |
                     cd ci/LDKSwift
-                    ../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
+                    ../../swift-5.7.2-RELEASE-ubuntu22.04/usr/bin/swift test -v
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
                     RUST_BACKTRACE: 1
             -   name: Test Swift bindings package with address sanitizer
                 continue-on-error: true
                 run: |
                     cd ci/LDKSwift
-                    ../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
+                    ../../swift-5.7.2-RELEASE-ubuntu22.04/usr/bin/swift test -v
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
-                    LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
+                    LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-14/lib/clang/14.0.0/lib/linux/libclang_rt.asan-x86_64.a
                     RUST_BACKTRACE: 1
diff --git a/.github/workflows/test-artifacts.yml b/.github/workflows/test-artifacts.yml
@@ -26,7 +26,7 @@ jobs:
                         human_readable_platform: 'catalyst'
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Xcarchive emulation
                 run: |
                     mkdir -p ./bindings/bin/release/${{ matrix.configuration['human_readable_platform'] }}
@@ -43,7 +43,7 @@ jobs:
         needs: [ create-artifact ]
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Download emulated xcarchives
                 uses: actions/download-artifact@v3
                 with:

diff --git a/.gitignore b/.gitignore
@@ -1,30 +1,38 @@
 .idea
-/output
-lib*.a
-.DS_Store
-__pycache__
+.build
+/node_modules
 
-ci/Build
-ci/LDKSwift/.build
-ci/LDKSwift/.swiftpm
+/out/production
+/out/test
 
-ci/LDKSwift/Sources/*
-!ci/LDKSwift/Sources/LDKSwift/
-!ci/LDKSwift/Sources/LDKSwift/batteries/*
-!ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift
+/src/lab/*
+/src/**/*.mjs
+/src/**/*.mjs.map
+/test/**/*.js
+/test/**/*.js.map
+
+/ci/LDKSwift/Sources/LDKHeaders
 
 /xcode/*/Build/
 /xcode/*/*.xcodeproj/project.xcworkspace/
 /xcode/*/*.xcodeproj/xcuserdata/
 /xcode/*/binary/*
 /xcode/*/headers/*
 /xcode/**/xcuserdata/*
+/xcode/build
+/xcuserdata/
 *.log
 
+
+
+poetry.lock
+pyproject.toml
+
 ## User settings
 xcode/build
 xcuserdata/
 /bindings/artifacts
 
 # VSCode
 .vscode/*
+
diff --git a/Pipfile b/Pipfile
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/__main__.py b/__main__.py
diff --git a/bindings/bin/.gitignore b/bindings/bin/.gitignore
diff --git a/ci/LDKSwift/Sources/LDKSwift/batteries/.gitignore b/ci/LDKSwift/Sources/LDKSwift/batteries/.gitignore