chore(docs): merge with next

Author: alejoamiras

.github/workflows/ci3.yml

@@ -34,7 +34,7 @@ jobs:
           # The commit to checkout. We want our actual commit, and not the result of merging the PR to the target.
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           # Fetch PR commits depth (we'll deepen by 1 in squash script if needed)
-          fetch-depth: ${{ github.event.pull_request.commits || 0 }}
+          fetch-depth: ${{ github.event.pull_request.commits || 1 }}
           persist-credentials: false
 
       - name: Run

.github/workflows/nightly-docs-release.yml

@@ -71,7 +71,8 @@ jobs:
           echo "GitHub release for $NIGHTLY_TAG is published."
 
           # Check if we already have docs for this nightly version
-          DOCS_VERSION_DIR="docs/versioned_docs/version-$NIGHTLY_TAG"
+          # For multi-instance docs, check the developer-specific versioned docs directory
+          DOCS_VERSION_DIR="docs/developer_versioned_docs/version-$NIGHTLY_TAG"
           BB_DOCS_VERSION_DIR="barretenberg/docs/versioned_docs/version-$NIGHTLY_TAG"
 
           if [ -d "$DOCS_VERSION_DIR" ] || [ -d "$BB_DOCS_VERSION_DIR" ]; then
@@ -126,7 +127,7 @@ jobs:
           ./scripts/aztec_nr_docs_generation/generate_aztec_nr_docs.sh ${{ env.NIGHTLY_TAG }}
           echo "Generated Aztec.nr API docs for: ${{ env.NIGHTLY_TAG }}"
 
-      - name: Create Aztec nightly docs version
+      - name: Create Aztec nightly docs version (Developer docs only)
         working-directory: ./docs
         run: |
           # Set the commit tag for version macros
@@ -138,15 +139,16 @@ jobs:
           # Build docs to ensure everything works
           COMMIT_TAG=${{ env.NIGHTLY_TAG }} yarn build
 
-          # Create the versioned docs
-          yarn docusaurus docs:version ${{ env.NIGHTLY_TAG }}
+          # Create the versioned docs for Developer docs only
+          # Network docs have separate versions for testnet/ignition releases
+          yarn docusaurus docs:version:developer ${{ env.NIGHTLY_TAG }}
 
-          echo "Created Aztec docs version: ${{ env.NIGHTLY_TAG }}"
+          echo "Created Aztec Developer docs version: ${{ env.NIGHTLY_TAG }}"
 
-      - name: Update Aztec Docs versions.json with new version
+      - name: Update Aztec Docs developer_versions.json with new version
         working-directory: ./docs/scripts
         run: |
-          ./update_versions.sh
+          ./update_docs_versions.sh developer
 
       - name: Cleanup Barretenberg docs nightly versions
         working-directory: ./barretenberg/docs

.github/workflows/release-please.yml

@@ -179,20 +179,31 @@ jobs:
           ./scripts/aztec_nr_docs_generation/generate_aztec_nr_docs.sh ${{ steps.version.outputs.semver }}
           echo "Generated Aztec.nr API docs for: ${{ steps.version.outputs.semver }}"
 
-      - name: Cut Aztec Docs version
+      - name: Cut Aztec Developer Docs version
         working-directory: ./docs
         run: |
           COMMIT_TAG=${{ steps.version.outputs.semver }}
-          # need to specify at least one version in versions.json for it to build
-          echo "[ \"$(./scripts/get_current_version.sh)\" ]" > versions.json
           yarn
           COMMIT_TAG=$COMMIT_TAG yarn build
-          COMMIT_TAG=$COMMIT_TAG yarn docusaurus docs:version ${{ steps.version.outputs.semver }}
+          # Create versioned docs for Developer docs instance
+          COMMIT_TAG=$COMMIT_TAG yarn docusaurus docs:version:developer ${{ steps.version.outputs.semver }}
 
-      - name: Update Aztec Docs versions.json with new version
+      - name: Update Aztec Developer Docs versions with new version
         working-directory: ./docs/scripts
         run: |
-          ./update_versions.sh
+          ./update_docs_versions.sh developer
+
+      - name: Cut Aztec Network Docs version
+        working-directory: ./docs
+        run: |
+          COMMIT_TAG=${{ steps.version.outputs.semver }}
+          # Create versioned docs for Network docs instance
+          COMMIT_TAG=$COMMIT_TAG yarn docusaurus docs:version:network ${{ steps.version.outputs.semver }}
+
+      - name: Update Aztec Network Docs versions with new version
+        working-directory: ./docs/scripts
+        run: |
+          ./update_docs_versions.sh network
 
       - name: Commit new Aztec Docs version
         run: |

barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp

@@ -285,7 +285,10 @@ T deserialize_any_format(std::vector<uint8_t>&& buf,
         // Once we remove support for legacy bincode format, we should expect to always
         // have a format marker corresponding to acir::serialization::Format::Msgpack,
         // but until then a match could be pure coincidence.
-        if (buf[0] == 2) {
+        const uint8_t FORMAT_MSGPACK = 2;
+        const uint8_t FORMAT_MSGPACK_COMPACT = 3;
+        uint8_t format = buf[0];
+        if (format == FORMAT_MSGPACK || format == FORMAT_MSGPACK_COMPACT) {
             // Skip the format marker to get the data.
             const char* buffer = &reinterpret_cast<const char*>(buf.data())[1];
             size_t size = buf.size() - 1;
@@ -295,10 +298,9 @@ T deserialize_any_format(std::vector<uint8_t>&& buf,
                 // This has to be on a separate line, see
                 // https://github.com/msgpack/msgpack-c/issues/695#issuecomment-393035172
                 auto o = oh.get();
-                // In experiments bincode data was parsed as 0.
-                // All the top level formats we look for are MAP types.
-                if (o.type == msgpack::type::MAP) {
-                    BB_ASSERT(false, "acir_format::deserialize_any_format: Msgpack is not currently supported.");
+                // In experiments bincode data was parsed as 0, so a successful parse is not a guarnatee that it's
+                // msgpack. All the top level formats we look for are MAP or ARRAY types (depending on the format).
+                if (o.type == msgpack::type::MAP || o.type == msgpack::type::ARRAY) {
                     return decode_msgpack(o);
                 }
             }