Merge branch 'main' into token-table-ordering

dfinity · Jul 15, 2024 · 7511a21 · 7511a21
2 parents 61ac927 + ac1bc6e
commit 7511a21
Show file tree

Hide file tree

Showing 97 changed files with 2,688 additions and 1,450 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -211,6 +211,12 @@ jobs:
           popd
       - name: Test getting proposal payloads
         run: scripts/nns-dapp/test-proposal-payload
+      - name: Install tools
+        run: |
+          # libarchive-zip-perl is needed for crc32, used by test-cmc-notify.
+          sudo apt-get update -yy && sudo apt-get install -yy libarchive-zip-perl
+      - name: Test CMC notify fallback mechanism
+        run: scripts/nns-dapp/test-cmc-notify
       - name: Verify that arguments are set in index.html
         run: |
           for ((i=5; i>0; i--)); do

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -247,12 +247,6 @@ jobs:
         uses: dfinity/setup-dfx@main
       - name: Test getting proposal args
         run: scripts/dfx-nns-proposal-args.test
-  docker-build-cli-flags:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: docker-build prints help
-        run: ./scripts/docker-build --help | grep -i usage
   minor-version-bump-works:
     runs-on: ubuntu-20.04
     steps:
@@ -284,77 +278,6 @@ jobs:
                   exit 1
           } >&2
           # TODO: Verify that the commits contain the expected changes.
-  download-nns-dapp-ci-wasm:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-13]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install bash and sha256sum if on Mac
-        run: |
-          if command -v brew ; then
-            brew install bash
-            brew install coreutils
-          fi
-      - name: Download NNS-dapp CI wasm
-        run: |
-          MAIN_COMMIT="$(git ls-remote --refs https://github.com/dfinity/nns-dapp.git main | awk '{print $1}')"
-          scripts/nns-dapp/download-ci-wasm.test --commit "$MAIN_COMMIT"
-    env:
-      GH_TOKEN: ${{ github.token }}
-  canister-ids-tool:
-    name: Test canister_ids tool
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-13]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install bash if on Mac
-        run: |
-          if command -v brew ; then
-            brew install bash
-          fi
-      - run: scripts/canister_ids.test
-  release-sop:
-    name: Test release-sop script
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-13]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install bash if on Mac
-        run: |
-          if command -v brew ; then
-            brew install bash
-          fi
-      - run: scripts/nns-dapp/release-sop.test
-  split-changelog:
-    name: Test split-changelog script
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-13]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install bash if on Mac
-        run: |
-          if command -v brew ; then
-            brew install bash
-          fi
-      - run: scripts/nns-dapp/split-changelog.test
-  unused-i18n:
-    name: Find unused i18n messages
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - run: scripts/unused-i18n
   version-match:
     name: The nns-dapp npm and cargo versions should match
     runs-on: ubuntu-20.04
@@ -370,12 +293,48 @@ jobs:
                   echo "Frontend: $frontend_version"
                   exit 1
           } >&2
-  network-config:
-    runs-on: ubuntu-20.04
+  small-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macos-13]
+    runs-on: ${{ matrix.os }}
+    env:
+      # Used by download-ci-wasm.test
+      GH_TOKEN: ${{ github.token }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install sponge
-        run: sudo apt-get update -yy && sudo apt-get install -yy moreutils && command -v sponge
+      - name: Install tools on Linux
+        run: |
+          if command -v apt-get; then
+            # libarchive-zip-perl is needed for crc32, used by convert-id.test
+            sudo apt-get update -yy && sudo apt-get install -yy moreutils libarchive-zip-perl && command -v sponge
+          fi
+      - name: Install tools on Mac
+        run: |
+          if command -v brew ; then
+            # coreutils is needed for
+            #   base32, used by convert-id.test, and
+            #   sha256sum, used download-ci-wasm.test
+            # moreutils is needed for sponge, used by network-config.test
+            brew install bash coreutils moreutils
+          fi
+      - name: docker-build prints help
+        run: ./scripts/docker-build --help | grep -i usage
+      - name: Download NNS-dapp CI wasm
+        run: |
+          MAIN_COMMIT="$(git ls-remote --refs https://github.com/dfinity/nns-dapp.git main | awk '{print $1}')"
+          scripts/nns-dapp/download-ci-wasm.test --commit "$MAIN_COMMIT"
+      - name: Test canister_ids tool
+        run: scripts/canister_ids.test
+      - name: Test release-sop script
+        run: scripts/nns-dapp/release-sop.test
+      - name: Test split-changelog script
+        run: scripts/nns-dapp/split-changelog.test
+      - name: Find unused i18n messages
+        run: scripts/unused-i18n
+      - name: Test the ID conversion script
+        run: scripts/convert-id.test
       - name: Getting network config works
         run: scripts/network-config.test
   checks-pass:
@@ -390,15 +349,10 @@ jobs:
       - release-templating-works
       - config-check
       - asset-chunking-works
-      - docker-build-cli-flags
-      - download-nns-dapp-ci-wasm
-      - canister-ids-tool
-      - release-sop
-      - split-changelog
       - minor-version-bump-works
-      - version-match
-      - network-config
       - migration-test-utils-work
+      - version-match
+      - small-tests
     if: ${{ always() }}
     runs-on: ubuntu-20.04
     steps:

diff --git a/.github/workflows/update-aggregator.yml b/.github/workflows/update-aggregator.yml
@@ -58,7 +58,7 @@ jobs:
         # Note: If there were no changes, this step creates no PR.
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           commit-message: Update aggregator
           committer: GitHub <[email protected]>
           author: gix-bot <[email protected]>

diff --git a/.github/workflows/update-didc.yml b/.github/workflows/update-didc.yml
@@ -44,7 +44,7 @@ jobs:
         if: ${{ steps.update.outputs.updated == '1' }}
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           base: main
           reviewers: mstrasinskis, dskloetd
           # Note: Please be careful when updating the add-paths field.  We have had the snsdemo committed by accident, with a pattern that matches nothing seemingly committing everything.

diff --git a/.github/workflows/update-ic-cargo-deps.yaml b/.github/workflows/update-ic-cargo-deps.yaml
@@ -25,7 +25,7 @@ jobs:
         if: ${{ steps.update.outputs.updated == '1' }}
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           base: main
           reviewers: mstrasinskis, dskloetd, nns-team
           # Note: Please be careful when updating the add-paths field.  We have had the snsdemo committed by accident, with a pattern that matches nothing seemingly committing everything.

diff --git a/.github/workflows/update-proposals.yml b/.github/workflows/update-proposals.yml
@@ -64,7 +64,7 @@ jobs:
         # Note: If there were no changes, this step creates no PR.
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           commit-message: Update proposals
           committer: GitHub <[email protected]>
           author: gix-bot <[email protected]>

diff --git a/.github/workflows/update-rust.yml b/.github/workflows/update-rust.yml
@@ -58,7 +58,7 @@ jobs:
         if: ${{ steps.update.outputs.updated == '1' }}
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           base: main
           reviewers: mstrasinskis, dskloetd
           # Note: Please be careful when updating the add-paths field.  We have had the snsdemo committed by accident, with a pattern that matches nothing seemingly committing everything.

diff --git a/.github/workflows/update-sns-aggregator-response.yml b/.github/workflows/update-sns-aggregator-response.yml
@@ -23,7 +23,7 @@ jobs:
         # Note: If there were no changes, this step creates no PR.
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           commit-message: Update SNS aggregator response
           committer: GitHub <[email protected]>
           author: gix-bot <[email protected]>

diff --git a/.github/workflows/update-snsdemo.yml b/.github/workflows/update-snsdemo.yml
@@ -58,7 +58,7 @@ jobs:
         if: ${{ steps.update.outputs.updated == '1' }}
         uses: peter-evans/create-pull-request@v4
         with:
-          token: ${{ secrets.GIX_BOT_PAT }}
+          token: ${{ secrets.GIX_CREATE_PR_PAT }}
           commit-message: Update snsdemo to ${{ steps.update.outputs.release }}
           committer: GitHub <[email protected]>
           author: gix-bot <[email protected]>

diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -15,25 +15,24 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
-* Make neurons table sortable on desktop and mobile.
 * A short delay before closing the mobile table sorting modal.
 
 #### Changed
 
-* Change neuron ID column title to "Neurons".
-* Excluded non-displayed empty neurons when loading neurons.
-* Transactions to neuron accounts are now displayed as "Sent" instead of "Staked" or "Top-up neuron" if the neuron is no longer displayed because it's disbursed or merged.
-* Change the color of the settings icon on the tokens table.
+* Reduce the frequency of checking if SNS neurons need to be refreshed.
 
 #### Deprecated
 
 #### Removed
 
-* Disable sorting the neurons table by neuron ID.
+* Remove default topic and proposal status filters.
+* Remove old canister creation/top-up mechanism that hasn't been used for 2 years.
 
 #### Fixed
 
 * Button disable state glitch when voting with neurons where one follows another.
+* Fix "the current proposals response is too large" error on proposals page.
+* Visibility of "Neuron Management" proposals in actionable list.
 
 #### Security
 
@@ -43,6 +42,9 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
+* Script to convert between ID formats
+* Test cycles minting canister notification mechanism of the nns-dapp.
+
 #### Changed
 
 #### Deprecated

diff --git a/CHANGELOG-Nns-Dapp.md b/CHANGELOG-Nns-Dapp.md
@@ -11,6 +11,27 @@ The NNS Dapp is released through proposals in the Network Nervous System. Theref
 Unreleased changes are added to `CHANGELOG-Nns-Dapp-unreleased.md` and moved
 here after a successful release.
 
+## Proposal 130986
+
+### Application
+
+#### Added
+
+* Make neurons table sortable on desktop and mobile.
+
+#### Changed
+
+* Change neuron ID column title to "Neurons".
+* Excluded non-displayed empty neurons when loading neurons.
+* Transactions to neuron accounts are now displayed as "Sent" instead of "Staked" or "Top-up neuron" if the neuron is no longer displayed because it's disbursed or merged.
+* Change the color of the settings icon on the tokens table.
+
+#### Removed
+
+* Disable sorting the neurons table by neuron ID.
+
+### Operations
+
 ## Proposal 130768
 
 ### Application