Merge pull request #336 from SylvainMartel/main

rust 1.81 update

Author: WadeBarnes

.github/workflows/build.yml

@@ -1,8 +1,8 @@
 name: "Indy-VDR"
 
 env:
-  RUST_VERSION: "1.70.0"
-  CROSS_VERSION: "0.2.4"
+  RUST_VERSION: "1.81.0"
+  CROSS_VERSION: "0.2.5"
 
 on:
   push:
@@ -42,7 +42,7 @@ jobs:
     name: Run checks
     strategy:
       matrix:
-        os: [macos-12, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -127,11 +127,11 @@ jobs:
             # using cross here to build against an older glibc for compatibility
             use_cross: true
           - architecture: darwin-universal
-            os: macos-12
+            os: macos-13
             lib: libindy_vdr.dylib
             target: darwin-universal
-            # beta or nightly required for aarch64-apple-darwin target
-            toolchain: beta
+            # As of Rust 1.80, aarch64-apple-darwin is stable
+            toolchain: stable
           - architecture: windows-x86_64
             os: windows-latest
             lib: indy_vdr.dll
@@ -298,7 +298,7 @@ jobs:
   build-ios:
     name: Build library (iOS)
     needs: [checks]
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         target: [aarch64-apple-ios, aarch64-apple-ios-sim, x86_64-apple-ios]
@@ -321,8 +321,14 @@ jobs:
 
       - name: Build
         run: |
+          # Set RUSTFLAGS to cap lints at warning level to prevent warnings from becoming errors
+          export RUSTFLAGS="--cap-lints=warn"
           cargo build --lib --release --target ${{ matrix.target }} --package indy-vdr
 
+      - name: List files in target
+        run: |
+          ls -la target/${{ matrix.target }}/release/
+
       - name: Save library
         uses: actions/upload-artifact@v4
         with:
@@ -331,7 +337,7 @@ jobs:
 
   create-ios-xcframework:
     name: Create iOS xcframework
-    runs-on: macos-12
+    runs-on: macos-13
     needs: build-ios
 
     steps:
@@ -341,10 +347,21 @@ jobs:
       - name: Fetch static libraries
         uses: actions/download-artifact@v4
 
+      - name: Debug - List downloaded files
+        run: find . -name "*.a" | sort
+
+      - name: Debug - Show directory structure
+        run: |
+          ls -la
+          ls -la library-aarch64-apple-ios
+          ls -la library-aarch64-apple-ios-sim  
+          ls -la library-x86_64-apple-ios
+
       - run: >
           ./build-xcframework.sh library-aarch64-apple-ios \
                                  library-aarch64-apple-ios-sim \
                                  library-x86_64-apple-ios
+
       - name: Save xcframework
         uses: actions/upload-artifact@v4
         with:
@@ -362,10 +379,6 @@ jobs:
   build-android:
     name: Build library (Android)
     needs: [checks]
-    # NB: RUST_VERSION must be <1.68 here to support NDK 17
-    env:
-      RUST_VERSION: "1.67"
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -385,10 +398,18 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
+          targets: ${{ matrix.target }}
+
+      - name: Cache cargo resources
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: deps
+          save-if: false
 
       - name: Build
         run: |
           cargo install --bins --git https://github.com/rust-embedded/cross --locked --tag v${{ env.CROSS_VERSION }} cross
+          # Using default Cross images since custom ones were removed from Cross.toml
           cross build --lib --release --target ${{matrix.target}} --package indy-vdr
 
       - name: Save library
@@ -479,9 +500,9 @@ jobs:
           - os: ubuntu-latest
             architecture: linux-x86_64
             plat-name: manylinux2014_x86_64
-          - os: macos-12
+          - os: macos-13
             architecture: darwin-universal
-            plat-name: macosx_10_9_universal2 # macosx_10_9_x86_64
+            plat-name: macosx_10_9_universal2
           - os: windows-latest
             architecture: windows-x86_64
             plat-name: win_amd64
@@ -515,8 +536,6 @@ jobs:
         working-directory: wrappers/python
 
       - name: Test python package
-        # FIXME cross platform test the python package
-        # maybe use the cross docker image?
         if: ${{ matrix.architecture != 'linux-aarch64' }}
         shell: sh
         run: |
@@ -545,4 +564,4 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           twine upload --skip-existing dist/*
-        working-directory: wrappers/python
+        working-directory: wrappers/python

Cross.toml

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

libindy_vdr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy-vdr"
-version = "0.4.3"
+version = "0.4.4"
 authors = [
     "Hyperledger Indy Contributors <[email protected]>",
 ]
@@ -30,10 +30,10 @@ default = ["ffi", "log", "zmq_vendored"]
 # This is added so we can lock the version that zmq uses
 # 0.1.49 is broken for ios targets
 cmake = { version = "=0.1.48", optional = true }
-base64 = "0.21"
+base64 = "0.22"
 bs58 = "0.5"
 etcommon-rlp = "0.2.4"
-env_logger = { version = "0.10", optional = true }
+env_logger = { version = "0.11", optional = true }
 ffi-support = { version = "0.4", optional = true }
 futures-channel = "0.3"
 futures-executor = "0.3"
@@ -63,7 +63,7 @@ zmq = "0.9"
 sled = "0.34.7"
 
 [dev-dependencies]
-rstest = "0.18"
+rstest = "0.25"
 indy-data-types = { version = "0.7", default-features = false, features = [
     "rich_schema",
 ] }

wrappers/golang/cmd/demo/demo.go

@@ -26,7 +26,7 @@ func main() {
 }
 
 func readOnlyDemo() {
-	genesisFile, err := http.Get("https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_builder_genesis")
+	genesisFile, err := http.Get("http://test.bcovrin.vonx.io/genesis")
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -50,7 +50,7 @@ func readOnlyDemo() {
 	d, _ := json.MarshalIndent(status, " ", " ")
 	fmt.Println(string(d))
 
-	rply, err := client.GetNym("FzAaV9Waa1DccDa72qwg13")
+	rply, err := client.GetNym("EyeymGxWv3YVXXJkjMEXBC")
 	if err != nil {
 		log.Fatalln(err)
 	}

wrappers/python/demo/batch_get_txn.py

@@ -102,10 +102,9 @@ def get_script_dir():
 
 def download_buildernet_genesis_file():
     genesis_file_url = (
-        "https://raw.githubusercontent.com/sovrin-foundation/"
-        "sovrin/master/sovrin/pool_transactions_builder_genesis"
+        "http://test.bcovrin.vonx.io/genesis"
     )
-    target_local_path = f"{get_script_dir()}/genesis_sov_buildernet.txn"
+    target_local_path = f"{get_script_dir()}/genesis_bcovrin_testnet.txn"
     LOGGER.info("Fetching genesis transactions")
     urllib.request.urlretrieve(genesis_file_url, target_local_path)
     return target_local_path

wrappers/python/demo/test.py

@@ -197,20 +197,20 @@ async def basic_test(transactions_path):
     # --- DID Resolution ---
 
     # The DID resolver can be initialized with a dict containing namespaces and pool instances:
-    # pool_map = await open_pools(ledgers=["idunion", "sovrin:builder"])
+    # pool_map = await open_pools(ledgers=["idunion", "indicio:testnet"])
     # resolver = Resolver(pool_map)
 
     # In addition, the the DID resolver can be started with autopilot = True.
     # Then it will try to fetch a genesis file from the did indy networks Github repo
     # for the given did:indy namespace.
     resolver = Resolver(autopilot=True)
 
-    log("Resolve DID did:indy:idunion:test:APs6Xd2GH8FNwCaXDw6Qm2")
-    doc = await resolver.resolve("did:indy:idunion:test:Fhbr2wQrJeB1UcZeFKpG5F")
+    log("Resolve DID did:indy:bcovrin:test:EyeymGxWv3YVXXJkjMEXBC")
+    doc = await resolver.resolve("did:indy:bcovrin:test:EyeymGxWv3YVXXJkjMEXBC")
     log(json.dumps(doc, indent=2))
 
     try:
-        doc = await resolver.resolve("did:indy:idunion:test:APs6Xd2GH8FNwCaXDw6Qm2")
+        doc = await resolver.resolve("did:indy:bcovrin:test:EyeymGxWv3YVXXJkjMEXBC")
     except VdrError as err:
         print(err)
 
@@ -232,12 +232,11 @@ def get_script_dir():
     return os.path.dirname(os.path.realpath(__file__))
 
 
-def download_buildernet_genesis_file():
+def download_bcovrin_testnet_genesis_file():
     genesis_file_url = (
-        "https://raw.githubusercontent.com/sovrin-foundation/"
-        "sovrin/master/sovrin/pool_transactions_builder_genesis"
+        "http://test.bcovrin.vonx.io/genesis"
     )
-    target_local_path = f"{get_script_dir()}/genesis_sov_buildernet.txn"
+    target_local_path = f"{get_script_dir()}/genesis_bcovrin_testnet.txn"
     urllib.request.urlretrieve(genesis_file_url, target_local_path)
     return target_local_path
 
@@ -246,6 +245,6 @@ def download_buildernet_genesis_file():
     log("indy-vdr version:", version())
 
     genesis_path = (
-        sys.argv[1] if len(sys.argv) > 1 else download_buildernet_genesis_file()
+        sys.argv[1] if len(sys.argv) > 1 else download_bcovrin_testnet_genesis_file()
     )
     asyncio.get_event_loop().run_until_complete(basic_test(genesis_path))