merge

ProvableHQ · Apr 3, 2024 · abd5235 · abd5235
2 parents 997b905 + e7ddc52
commit abd5235
Show file tree

Hide file tree

Showing 744 changed files with 13,623 additions and 9,111 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,7 +50,7 @@ commands:
 jobs:
   check-style:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - checkout
@@ -66,7 +66,7 @@ jobs:
 
   clippy:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - checkout
@@ -83,7 +83,7 @@ jobs:
 
   leo-executable:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - checkout
@@ -102,7 +102,7 @@ jobs:
 
   leo-new:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -115,7 +115,7 @@ jobs:
 
   leo-clean:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -128,7 +128,7 @@ jobs:
 
   leo-example:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -141,7 +141,7 @@ jobs:
 
   test-examples:
     docker:
-      - image: cimg/rust:1.74
+      - image: cimg/rust:1.76
     resource_class: xlarge
     steps:
       - attach_workspace:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,6 +100,7 @@ jobs:
       RUSTC_WRAPPER: sccache
       SCCACHE_CACHE_SIZE: 2G
       SCCACHE_DIR: /Users/runner/Library/Caches/Mozilla.sccache
+      # SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
     steps:
       - name: Xcode Select
         uses: maxim-lobanov/setup-xcode@v1
@@ -148,8 +149,8 @@ jobs:
           
       - name: Test
         run: |
-          SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) \
-          MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) \
+          SDKROOT=$(xcrun -sdk macosx --show-sdk-path) \
+          MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version) \
           cargo test --all
 
       - name: Print sccache stats
@@ -183,6 +184,7 @@ jobs:
       RUSTC_WRAPPER: sccache
       SCCACHE_CACHE_SIZE: 2G
       SCCACHE_DIR: /home/runner/.cache/sccache
+      SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -334,4 +336,4 @@ jobs:
         run: sccache --show-stats
 
       - name: Stop sccache server
-        run: sccache --stop-server || true
+        run: sccache --stop-server || true
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,8 +1,8 @@
-name: Testnet3 Crates Docs
+name: Mainnet Crates Docs
 on:
   push:
     branches:
-      - testnet3
+      - mainnet
 
 jobs:
   build-crates-docs:
@@ -12,6 +12,7 @@ jobs:
       RUSTC_WRAPPER: sccache
       SCCACHE_CACHE_SIZE: 2G
       SCCACHE_DIR: /home/runner/.cache/sccache
+      # SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -21,7 +22,7 @@ jobs:
       - name: Install sccache
         env:
           LINK: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.7.6
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin
@@ -66,4 +67,4 @@ jobs:
         run: sccache --show-stats
 
       - name: Stop sccache server
-        run: sccache --stop-server || true
+        run: sccache --stop-server || true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -158,8 +158,8 @@ jobs:
 
       - name: Build Leo
         run: |
-          SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) \
-          MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) \
+          SDKROOT=$(xcrun -sdk macosx --show-sdk-path) \
+          MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version) \
           cargo build -p leo-lang --release --target=aarch64-apple-darwin --features noconfig && strip target/aarch64-apple-darwin/release/leo
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: true

diff --git a/.resources/release-version b/.resources/release-version
@@ -1 +1 @@
-v1.10.0
+v1.11.0
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md