Merge branch 'develop' of github.com:iotaledger/iota into protocol/bu…

…rn_slashed_rewards-RD1

.github/CODEOWNERS

@@ -36,7 +36,6 @@
 
 # core-consensus team
 /consensus/ @iotaledger/core-consensus
-/narwhal/ @iotaledger/core-consensus
 
 # dev-tools team
 /crates/iota/ @iotaledger/dev-tools
@@ -69,11 +68,11 @@ vercel.json @iotaledger/boxfish @iotaledger/tooling
 /docs/**/vercel.json @iotaledger/devx
 
 # CI Taskforce
-/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
-/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
+/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
+/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
 
 # Protect this CODEOWNERS file, with some fallback in case of unavailability
-/.github/CODEOWNERS @luca-moser @lzpap @miker83z @fijter
+/.github/CODEOWNERS @luca-moser @lzpap @miker83z @alexsporn
 
 # Scripts
 /scripts/dependency_graphs/ @muXxer

.github/actions/diffs/action.yml

@@ -27,7 +27,6 @@ runs:
             - "consensus/**"
             - "crates/**"
             - "external-crates/**"
-            - "narwhal/**"
             - "iota-execution/**"
             - "docs/examples/rust/**"
             - ".github/workflows/hierarchy.yml"
@@ -64,6 +63,5 @@ runs:
             - "docker/**"
             - "external-crates/**"
             - "kiosk/**"
-            - "narwhal/**"
             - "nre/**"
             - "iota-execution/**"

.github/crates-filters.yml

@@ -170,16 +170,6 @@ typed-store-derive:
   - "crates/typed-store-derive/**"
 typed-store-error:
   - "crates/typed-store-error/**"
-narwhal-config:
-  - "narwhal/config/**"
-narwhal-crypto:
-  - "narwhal/crypto/**"
-narwhal-network:
-  - "narwhal/network/**"
-narwhal-test-utils:
-  - "narwhal/test-utils/**"
-narwhal-types:
-  - "narwhal/types/**"
 iota-execution:
   - "iota-execution/**"
 iota-execution-cut:

.github/workflows/_cargo_deny.yml

@@ -2,6 +2,11 @@ name: Cargo deny
 
 on:
   workflow_call:
+    inputs:
+      manifest-path:
+        type: string
+        required: false
+        default: "./Cargo.toml"
     secrets:
       SSH_PRIVATE_KEY_IOTA_CI:
         required: true
@@ -13,24 +18,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  rust-crates:
-    name: cargo-deny (advisories, licenses, bans, ...)
-    runs-on: [self-hosted]
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
-      - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # pin@v2
-        with:
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          ssh-known-hosts: ${{ secrets.SSH_GITHUB_KNOWN_HOSTS }}
-          use-git-cli: true
-
-  external-crates:
-    name: cargo-deny (advisories, licenses, bans, ...)
+  cargo-deny:
     runs-on: [self-hosted]
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
       - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # pin@v2
         with:
+          manifest-path: ${{ inputs.manifest-path }}
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
           ssh-known-hosts: ${{ secrets.SSH_GITHUB_KNOWN_HOSTS }}
           use-git-cli: true

.github/workflows/_e2e.yml

@@ -88,6 +88,14 @@ jobs:
           path: apps/explorer/playwright-report/
           retention-days: 30
 
+      - name: Build Kiosk
+        if: inputs.isRust || inputs.isTypescriptSDK
+        run: pnpm turbo --filter=@iota/kiosk build
+
+      - name: Run Kiosk e2e tests
+        if: inputs.isRust || inputs.isTypescriptSDK
+        run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter=@iota/kiosk test:e2e'
+
       - name: Run Local net
         run: cargo run --bin iota start --force-regenesis --with-faucet --epoch-duration-ms 10000 &
 

.github/workflows/_rust.yml

@@ -62,6 +62,5 @@ jobs:
     if: |
       !cancelled() && !failure() && inputs.isRust && github.event.pull_request.draft == false
     needs:
-      - rust-tests
-      - external-tests
+      - rust-lints
     uses: ./.github/workflows/_execution_cut.yml

.github/workflows/_rust_lints.yml

@@ -51,10 +51,6 @@ jobs:
       - rustfmt
     runs-on: [self-hosted]
     steps:
-      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # pin@v3
-        # this avoids rate-limiting
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
       # TODO(bradh): debug and re-enable this; the caching is breaking the clippy build
       # Enable caching of the 'librocksdb-sys' crate by additionally caching the

.github/workflows/_vercel_deploy.yml

@@ -36,63 +36,63 @@ jobs:
   explorer-preview:
     name: Vercel Explorer Preview
     if: inputs.shouldDeployPreview && inputs.isExplorer
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   explorer-prod:
     name: Vercel Explorer Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   ui-kit-preview:
     name: Vercel UI Kit Preview
     if: inputs.shouldDeployPreview && inputs.isAppsUiKit
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   ui-kit-prod:
-    name: Vercel UI Kit Preview
+    name: Vercel UI Kit Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   wallet-dashboard-preview:
     name: Vercel Wallet Dashboard Preview
     if: inputs.shouldDeployPreview && inputs.isWalletDashboard
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   wallet-dashboard-prod:
     name: Vercel Wallet Dashboard Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   apps-backend-preview:
     name: Vercel apps-backend Preview
     if: inputs.shouldDeployPreview && inputs.isAppsBackend
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   apps-backend-prod:
     name: Vercel apps-backend Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: true

.github/workflows/nightly.yml

@@ -29,6 +29,12 @@ env:
   RUST_BACKTRACE: short
 
 jobs:
+  cargo-deny-external:
+    uses: ./.github/workflows/_cargo_deny.yml
+    with:
+      manifest-path: external-crates/move/Cargo.toml
+    secrets: inherit
+
   release:
     name: build release binaries
     runs-on: ${{ matrix.os }}

.github/workflows/release-docker.yml → .github/workflows/release_docker.yml

@@ -46,11 +46,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-node
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -97,11 +105,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-indexer
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -148,11 +164,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-tools
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -199,11 +223,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-graphql-rpc
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3

.github/workflows/release-notes-monitor.yml → .github/workflows/release_notes_monitor.yml

@@ -33,7 +33,7 @@ jobs:
           export previous_tag=$(git tag | grep -E 'iota_v1(.*)_rel_notes' | sort -rV | head -1)
           export previous_commit_hash=$(git rev-list -n 1 ${previous_tag})
 
-          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk narwhal nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
+          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
 
           echo "matrix=${list_of_prs}" >> $GITHUB_OUTPUT
           echo "new_commit_hash=${new_commit_hash}" >> $GITHUB_OUTPUT