Merge branch 'main' into nums

MystenLabs · Sep 5, 2024 · 404ca52 · 404ca52
2 parents 6b07ecc + 9a3a085
commit 404ca52
Show file tree

Hide file tree

Showing 409 changed files with 19,365 additions and 5,769 deletions.
diff --git a/.changeset/clever-suits-eat.md b/.changeset/clever-suits-eat.md
@@ -0,0 +1,5 @@
+---
+'@mysten/zksend': patch
+---
+
+Add network param to zksend links
diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml
@@ -87,12 +87,12 @@ jobs:
           swap-size-gb: 256
       - name: Install Foundry
         run: |
-          curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup'; } | bash
+          curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup --version nightly-fdfaafd629faa2eea3362a8370eef7c1f8074710'; } | bash
           echo "$HOME/.config/.foundry/bin" >> $GITHUB_PATH
       - name: Install Foundry Dependencies
         working-directory: bridge/evm
         run: |
-          forge install https://github.com/OpenZeppelin/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
+          forge soldeer update
       - name: cargo test
         run: |
           cargo nextest run --profile ci -E 'package(sui-bridge)'
@@ -109,12 +109,12 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
       - name: Install Foundry
         run: |
-          curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup'; } | bash
+          curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup --version nightly-fdfaafd629faa2eea3362a8370eef7c1f8074710'; } | bash
           echo "$HOME/.config/.foundry/bin" >> $GITHUB_PATH
       - name: Install Foundry Dependencies
         working-directory: bridge/evm
         run: |
-          forge install https://github.com/OpenZeppelin/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
+          forge soldeer update
       - name: Check Bridge EVM Unit Tests
         shell: bash
         working-directory: bridge/evm

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -52,7 +52,6 @@ jobs:
     outputs:
       isRust: ${{ steps.diff.outputs.isRust }}
       isMove: ${{ steps.diff.outputs.isMove }}
-      isReleaseNotesEligible: ${{ steps.diff.outputs.isReleaseNotesEligible }}
       isMoveAutoFormatter: ${{ steps.diff.outputs.isMoveAutoFormatter }}
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
@@ -77,23 +76,6 @@ jobs:
           locked: true
       - run: cargo xlint
 
-  release-notes-description-check:
-    name: release-notes-check
-    needs: diff
-    if: needs.diff.outputs.isReleaseNotesEligible == 'true'
-    runs-on: [ ubuntu-latest ]
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
-        with:
-          ref: ${{ github.event.inputs.sui_repo_ref || github.ref }}
-      - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
-        with:
-          python-version: 3.10.10
-      - name: Validate PR's release notes
-        shell: bash
-        run: |
-          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python ./scripts/release_notes.py check
-
   move-auto-formatter-ci-test:
     needs: diff
     if: needs.diff.outputs.isMoveAutoFormatter == 'true'
@@ -141,6 +123,8 @@ jobs:
         with:
           ref: ${{ github.event.inputs.sui_repo_ref || github.ref }}
       - uses: taiki-e/install-action@nextest
+      - name: Add postgres to PATH
+        run: echo "/usr/lib/postgresql/14/bin" >> $GITHUB_PATH
       - name: Set Swap Space
         uses: pierotofy/set-swap-space@master
         with:
@@ -424,40 +408,16 @@ jobs:
     if: needs.diff.outputs.isRust == 'true'
     timeout-minutes: 45
     runs-on: [ ubuntu-ghcloud ]
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgrespw
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-          --name postgres_container
-        ports:
-          - 5432:5432
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
         with:
           ref: ${{ github.event.inputs.sui_repo_ref || github.ref }}
       - uses: taiki-e/install-action@nextest
-      - name: Setup db
-        run: |
-          PGPASSWORD=$POSTGRES_PASSWORD psql -h localhost -U $POSTGRES_USER -c 'CREATE DATABASE sui_indexer;' -c 'ALTER SYSTEM SET max_connections = 500;'
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgrespw
-      - run: docker restart --time 0 postgres_container
-      - run: sleep 5
+      - name: Add postgres to PATH
+        run: echo "/usr/lib/postgresql/14/bin" >> $GITHUB_PATH
       - name: tests-requiring-postgres
         run: |
-          cargo nextest run --test-threads 1 --package sui-graphql-rpc --test e2e_tests --test examples_validation_tests --features pg_integration
-          cargo nextest run --test-threads 1 --package sui-graphql-rpc --lib --features pg_integration -- test_query_cost
-          cargo nextest run --test-threads 4 --package sui-graphql-e2e-tests --features pg_integration
-          cargo nextest run --test-threads 1 --package sui-cluster-test --test local_cluster_test --features pg_integration
-          cargo nextest run --test-threads 1 --package sui-indexer --test ingestion_tests --features pg_integration
 
-        env:
-          POSTGRES_HOST: localhost
-          POSTGRES_PORT: 5432
+          # The tests in these packages have been converted to use a temporary, ephemoral postgres database and so can be run in parallel
+          cargo nextest run --profile ci --package sui-indexer --package sui-graphql-e2e-tests --package sui-cluster-test --package sui-graphql-rpc --features pg_integration
+
diff --git a/.github/workflows/validate-release-notes-pre-land.yml b/.github/workflows/validate-release-notes-pre-land.yml
@@ -0,0 +1,54 @@
+name: Validate Release Notes
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'devnet'
+      - 'testnet'
+      - 'mainnet'
+      - 'releases/sui-*-release'
+  pull_request:
+    types: [ opened, synchronize, reopened, edited, ready_for_review ]
+  workflow_dispatch:
+    inputs:
+      sui_repo_ref:
+        description: "Branch / commit to test"
+        type: string
+        required: false
+        default: ''
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  diff:
+    name: Determine PR eligibility for ${{ github.event.pull_request.number }}
+    runs-on: [ ubuntu-latest ]
+    outputs:
+      isReleaseNotesEligible: ${{ steps.diff.outputs.isReleaseNotesEligible }}
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
+        with:
+          ref: ${{ github.event.inputs.sui_repo_ref || github.ref }}
+      - name: Detect Changes
+        uses: './.github/actions/diffs'
+        id: diff
+
+  release-notes-description-check:
+    name: Validate Release Notes in ${{ github.event.pull_request.number }}
+    needs: diff
+    if: needs.diff.outputs.isReleaseNotesEligible == 'true'
+    runs-on: [ ubuntu-latest ]
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
+        with:
+          ref: ${{ github.event.inputs.sui_repo_ref || github.ref }}
+      - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
+        with:
+          python-version: 3.10.10
+      - name: Validate PR's release notes
+        shell: bash
+        run: |
+          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python ./scripts/release_notes.py check ${{ github.event.pull_request.number }}