Merge branch 'main' into feature/tls-support

Author: mirgee

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: "Indy-VDR"
 
 env:
-  RUST_VERSION: "1.63.0"
+  RUST_VERSION: "1.65.0"
   CROSS_VERSION: "0.2.4"
 
 on:
@@ -243,6 +243,15 @@ jobs:
       - name: Check types
         run: yarn check-types
 
+      - name: Run local node pool
+        run: |
+          cd ../../
+          docker build -f ci/indy-pool.dockerfile -t test_pool --build-arg pool_ip=10.0.0.2 ci
+          docker network create --subnet=10.0.0.0/8 indy-sdk-network
+          docker run -d --name indy_pool -p 9701-9708:9701-9708 --net=indy-sdk-network test_pool
+          cd wrappers/javascript
+          docker exec $(docker ps -aqf "ancestor=test_pool") cat /var/lib/indy/sandbox/pool_transactions_genesis >> genesis.txn
+
       - name: Run tests
         env:
           # binary is downloaded to root of repository
@@ -283,16 +292,14 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          # First version with support for cdylib: https://github.com/rust-lang/rust/pull/100636
-          toolchain: "1.65.0"
+          toolchain: ${{ env.RUST_VERSION }}
           targets: ${{ matrix.target }}
 
-      # Not useful unless the toolchain version matches the default
-      # - name: Cache cargo resources
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     shared-key: deps
-      #     save-if: false
+      - name: Cache cargo resources
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: deps
+          save-if: false
 
       - name: Build
         run: |
@@ -302,7 +309,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: library-${{ matrix.target}}
-          path: target/${{ matrix.target }}/release/libindy_vdr.dylib
+          path: target/${{ matrix.target }}/release/libindy_vdr.a
 
   create-ios-xcframework:
     name: Create iOS xcframework
@@ -313,7 +320,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Fetch dynamic libraries
+      - name: Fetch static libraries
         uses: actions/download-artifact@v3
 
       - run: >
@@ -337,6 +344,9 @@ jobs:
   build-android:
     name: Build library (Android)
     needs: [checks]
+    env:
+      RUST_VERSION: "1.64.0" # Overriding the rust version here for lower NDK support
+
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -352,6 +362,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+
       - name: Build
         run: |
           cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross

Cross.toml

@@ -5,13 +5,13 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
 image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"
 
 [target.x86_64-linux-android]
-image = "ghcr.io/cross-rs/x86_64-linux-android:main"
+image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"
 
 [target.i686-linux-android]
-image = "ghcr.io/cross-rs/i686-linux-android:main"
+image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"
 
 [target.aarch64-linux-android]
-image = "ghcr.io/cross-rs/aarch64-linux-android:main"
+image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"
 
 [target.armv7-linux-androideabi]
-image = "ghcr.io/cross-rs/armv7-linux-androideabi:main"
+image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"

build-xcframework.sh

@@ -3,22 +3,25 @@
 set -eo pipefail
 
 # Check if lipo and xcodebuild exist
-if [ -z `command -v lipo` ] || [ -z `command -v xcodebuild` ]
+if [ -z `command -v lipo` ] || [ -z `command -v xcodebuild` ] || [ -z `command -v sed` ]
+
 then
-    echo "!!! lipo or xcodebuild could not be found !!!"
+    echo "!!! lipo, xcodebuild or sed could not be found !!!"
     help
 fi
 
 NAME="indy_vdr"
+BUNDLE_NAME="indy-vdr"
 VERSION=$(cargo generate-lockfile && cargo pkgid indy-vdr | sed -e "s/^.*[#@]//")
 echo $VERSION
-BUNDLE_IDENTIFIER="org.hyperledger.$NAME"
-LIBRARY_NAME="lib$NAME.dylib"
+BUNDLE_IDENTIFIER="org.hyperledger.$BUNDLE_NAME"
+LIBRARY_NAME="lib$NAME.a"
 XC_FRAMEWORK_NAME="$NAME.xcframework"
 FRAMEWORK_LIBRARY_NAME=$NAME
 FRAMEWORK_NAME="$FRAMEWORK_LIBRARY_NAME.framework"
 HEADER_NAME="lib$NAME.h"
 OUT_PATH="out"
+MIN_IOS_VERSION="12.0"
 
 # Setting some default paths
 AARCH64_APPLE_IOS_PATH="./target/aarch64-apple-ios/release"
@@ -33,9 +36,9 @@ Help() {
   echo "  - xcodebuild"
   echo "To build an xcframework with underlying Frameworks"
   echo "the following can be passed in as positional arguments"
-  echo "  1. Path to the aarch64-apple-ios directory where the $LIBRARY is stored"
-  echo "  2. Path to the aarch64-apple-ios-sim directory where the $LIBRARY is stored"
-  echo "  3. Path to the x86_64-apple-ios directory where the $LIBRARY is stored"
+  echo "  1. Path to the aarch64-apple-ios directory where the $LIBRARY_NAME is stored"
+  echo "  2. Path to the aarch64-apple-ios-sim directory where the $LIBRARY_NAME is stored"
+  echo "  3. Path to the x86_64-apple-ios directory where the $LIBRARY_NAME is stored"
   echo "  4. Path to the header file, excluding the header"
   echo "Make sure to add the 'release' section of the path for a"
   echo "release build."
@@ -156,6 +159,8 @@ cat <<EOT >> Info.plist
 	<string>$VERSION</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
+  <key>MinimumOSVersion</key>
+  <string>$MIN_IOS_VERSION</string>
 </dict>
 </plist>
 EOT
@@ -179,8 +184,4 @@ xcodebuild -create-xcframework \
 echo "cleaning up..."
 rm -rf $FRAMEWORK_NAME real sim
 
-echo "Fixing the identifiers of the dylib..."
-install_name_tool -id  @rpath/$NAME.framework/$FRAMEWORK_LIBRARY_NAME $XC_FRAMEWORK_NAME/ios-arm64/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
-install_name_tool -id  @rpath/$NAME.framework/$FRAMEWORK_LIBRARY_NAME $XC_FRAMEWORK_NAME/ios-arm64_x86_64-simulator/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
-
 echo "Framework written to $OUT_PATH/$XC_FRAMEWORK_NAME"

libindy_vdr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy-vdr"
-version = "0.4.0-dev.14"
+version = "0.4.0-dev.16"
 authors = ["Hyperledger Indy Contributors <[email protected]>"]
 description = "A library for interacting with Hyperledger Indy Node, a distributed ledger for self-sovereign identity (https://www.hyperledger.org/use/hyperledger-indy)."
 edition = "2021"

wrappers/javascript/.eslintrc.js

@@ -71,8 +71,10 @@ module.exports = {
   },
   overrides: [
     {
-      files: ['arch.js'],
-      env: { node: true },
+      files: ['arch.js', 'platform.js'],
+      env: {
+        node: true,
+      },
       rules: {
         '@typescript-eslint/no-unsafe-assignment': 'off',
         'no-console': 'off',
@@ -91,5 +93,14 @@ module.exports = {
         '@typescript-eslint/no-unsafe-call': 'off',
       },
     },
+    {
+      files: ['**.test.**'],
+      env: {
+        node: true,
+      },
+      rules: {
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+      },
+    },
   ],
 }

wrappers/javascript/indy-vdr-nodejs/README.md

@@ -33,4 +33,22 @@ const getSchemaRequest = new GetSchemaRequest({
 const schemaResponse = await pool.submitRequest(getSchemaRequest)
 ```
 
+## Testing
+
+In order to test this library, you need a local indy network running. This can be done with the following commands (from the root of the repository):
+
+```sh
+docker build -f ci/indy-pool.dockerfile -t test_pool --build-arg pool_ip=10.0.0.2 ci
+docker network create --subnet=10.0.0.0/8 indy-sdk-network
+docker run -d --name indy_pool -p 9701-9708:9701-9708 --net=indy-sdk-network test_pool
+
+# Network is now running
+
+cd wrappers/javascript
+
+docker exec $(docker ps -aqf "ancestor=test_pool") cat /var/lib/indy/sandbox/pool_transactions_genesis >> genesis.txn
+
+yarn test:local-build
+```
+
 > **Note**: If you want to use this library in a cross-platform environment you need to import methods from the `@hyperledger/indy-vdr-shared` package instead. This is a platform independent package that allows to register the native bindings. The `@hyperledger/indy-vdr-nodejs` package uses this package under the hood. See the [Indy VDR Shared README](https://github.com/hyperledger/indy-vdr/tree/main/wrappers/javascript/indy-vdr-shared/README.md) for documentation on how to use this package.

wrappers/javascript/indy-vdr-nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/indy-vdr-nodejs",
-  "version": "0.1.0-dev.14",
+  "version": "0.1.0",
   "license": "Apache-2.0",
   "description": "Nodejs wrapper for Indy Vdr",
   "source": "src/index",
@@ -41,7 +41,7 @@
     "typescript": "~4.9.4"
   },
   "dependencies": {
-    "@hyperledger/indy-vdr-shared": "0.1.0-dev.14",
+    "@hyperledger/indy-vdr-shared": "0.1.0",
     "@mapbox/node-pre-gyp": "^1.0.10",
     "@types/ref-array-di": "^1.2.5",
     "ffi-napi": "^4.0.3",
@@ -52,7 +52,7 @@
   "binary": {
     "module_name": "indy_vdr",
     "module_path": "native",
-    "remote_path": "v0.4.0-dev.14",
+    "remote_path": "v0.4.0-dev.16",
     "host": "https://github.com/hyperledger/indy-vdr/releases/download/",
     "package_name": "library-{platform}-{arch}.tar.gz"
   }

wrappers/javascript/indy-vdr-nodejs/scripts/platform.js

@@ -1,7 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-undef */
 const os = require('os')
 
 // Find appropriate target architecture for retrieving the anoncreds library

wrappers/javascript/indy-vdr-nodejs/tests/IndyVdrPool.test.ts

@@ -1,17 +1,14 @@
-// TODO: this should be turned off at a eslint config level for tests
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 import type { IndyVdrPool } from '@hyperledger/indy-vdr-nodejs'
 
-import { SOVRIN_GENESIS_TRANSACTION_BUILDER_NET } from './utils'
+import { genesisTxnPath } from './utils'
 
 import { PoolCreate } from '@hyperledger/indy-vdr-nodejs'
 
 describe('IndyVdrPool', () => {
   let pool: IndyVdrPool
 
   beforeAll(() => {
-    pool = new PoolCreate({ parameters: { transactions: SOVRIN_GENESIS_TRANSACTION_BUILDER_NET } })
+    pool = new PoolCreate({ parameters: { transactions_path: genesisTxnPath } })
   })
 
   test('Get pool handle', () => {

wrappers/javascript/indy-vdr-nodejs/tests/IndyVdrRequest.test.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 import type { IndyVdrRequest } from '@hyperledger/indy-vdr-nodejs'
 
 import { DID, SCHEMA_ID } from './utils'