Merge pull request #4020 from mobilecoinfoundation/6-1-1-sync-main

Sync v6.1.1 to main
mobilecoinfoundation · Dec 11, 2024 · a3f2259 · a3f2259
2 parents de933b9 + 9d5a488
commit a3f2259
Show file tree

Hide file tree

Showing 212 changed files with 760 additions and 637 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -311,7 +311,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3'
+          python-version: '3.13'
       - name: Set up environment
         working-directory: tools/fog-local-network
         shell: bash

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 The crates in this repository do not adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) at this time.
 
+## [6.1.1]
+
+### Fixed
+
+- Update grpcio for fog-local-network ([#4014])
+- Fix ledger distribution resync ([#4013])
+
 ## [6.1.0]
 
 ### Changed