Merge branch 'main' into ci/update-regression-test-action

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@
 name: Deploy
 
 on:
-  pull_request:
+  pull_request_target:
   push:
     branches: [main]
 
@@ -11,8 +11,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # Job that requires project maintainers to approve PR to access Github Action secrets.
+  # https://dvc.ai/blog/testing-external-contributions-using-github-actions-secrets
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository && 'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+
   # Deploy the CDK environment in one step, with the gas token feature enabled.
   monolithic:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -54,6 +63,7 @@ jobs:
 
   # Deploy the CDK environment incrementally, stage by stage.
   incremental:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -135,6 +145,7 @@ jobs:
 
   # Deploy the CDK environment without specifying any parameter file.
   configless:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -151,6 +162,7 @@ jobs:
 
   # Deploy the CDK environment with the gas token feature enabled.
   gas-token:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -169,6 +181,7 @@ jobs:
 
   # Deploy the CDK environment against a local l1 chain with pre-deployed zkevm contracts.
   pre-deployed-contracts:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -213,6 +226,9 @@ jobs:
 
   # Deploy a standalone permisionless node against Sepolia.
   permisionless-node:
+    needs: authorize
+    # Prevent this job to run on forks.
+    if: github.repository == '0xPolygon/kurtosis-cdk'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -234,6 +250,7 @@ jobs:
 
   # Deploy the CDK environment in rollup mode (data availability).
   rollup-da-mode:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -252,6 +269,7 @@ jobs:
 
   # Deploy the CDK environment in cdk-validium mode (data availability).
   cdk-validium-da-mode:
+    needs: authorize
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

docs/how-to/migrate/forkid-7-to-9.md

@@ -5,9 +5,9 @@ comments: true
 This document shows you how to migrate from fork 7 to fork 9 using the Kurtosis package.
 
 !!! tip
-    These steps are similar a production build, except you have to use a [timelock](https://github.com/0xPolygonHermez/zkevm-contracts/blob/v5.0.1-rc.2-fork.8/contracts/PolygonZkEVMTimelock.sol) contract to make the calls.
+    These steps are similar to a production build, except you have to use a [timelock](https://github.com/0xPolygonHermez/zkevm-contracts/blob/v5.0.1-rc.2-fork.8/contracts/PolygonZkEVMTimelock.sol) contract to make the calls.
 
-## Prequisite steps and set up
+## Prerequisite steps and set up
 
 1. Run a clean command to remove any lingering state:
 
@@ -221,7 +221,7 @@ After a few minutes, the number of verified batches should increase (the first b
         "rollupIDToRollupData(uint32)(address,uint64,address,uint64,bytes32,uint64,uint64,uint64,uint64,uint64,uint64,uint8)" 1
     ```
 
-8. Set up the data availability protcol again:
+8. Set up the data availability protocol again:
 
     ```sh
     dac="$(kurtosis service exec cdk-v1 contracts-001 "jq -r .polygonDataCommittee /opt/zkevm/combined.json" | tail -n +2)"

docs/how-to/use-native-token.md

@@ -2,7 +2,7 @@
 comments: true
 ---
 
-This document show you how you to set up and test a native token in a CDK stack. 
+This document shows you how to set up and test a native token in a CDK stack. 
 
 ## Summary
 
@@ -243,7 +243,7 @@ jq -c '.[]' claimable-txs.json | while IFS= read -r tx; do
   in_amount="$(echo "$tx" | jq -r '.amount')"
   in_metadata="$(echo "$tx" | jq -r '.metadata')"
 
-  # Generate the call data, this is useful just to examine what the call will look loke
+  # Generate the call data, this is useful just to examine what the call will look like
   echo "Generating the call data for the bridge claim tx..."
   cast calldata "$claim_sig" "$in_merkle_proof" "$in_rollup_merkle_proof" "$in_global_index" "$in_main_exit_root" "$in_rollup_exit_root" "$in_orig_net" "$in_orig_addr" "$in_dest_net" "$in_dest_addr" "$in_amount" "$in_metadata"
 

docs/quickstart/set-up-permissionless-node.md

@@ -49,7 +49,7 @@ You can also use the package you have just set up to sync data from a production
     !!! tip
         The [run-contract-setup.sh](https://github.com/0xPolygon/kurtosis-cdk/blob/main/templates/run-contract-setup.sh) file may help you understand how these fields populate.
 
-2. When you have the updated genesis file is ready, drop it into `./templates/permissionless-node/genesis.json`.
+2. When you have the updated genesis file ready, drop it into `./templates/permissionless-node/genesis.json`.
 
 3. In addition to the genesis setup, tweak the parameter `l1_rpc_url` in the [params.yml](https://github.com/0xPolygon/kurtosis-cdk/blob/main/params.yml) file:
 
@@ -65,4 +65,4 @@ You can also use the package you have just set up to sync data from a production
     kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
     ```
 
-<br/>
+<br/>

templates/trusted-node/node-config.toml

@@ -1285,11 +1285,11 @@ Password = "{{.zkevm_l2_keystore_password}}"
 # Password = "{{.zkevm_l2_keystore_password}}"
 
 # ==============================================================================
-#  _     _  ____    _    ____  ____  ____  ___ ____ _____
-# | |   / |/ ___|  / \  / ___||  _ \|  _ \|_ _/ ___| ____|
-# | |   | | |  _  / _ \ \___ \| |_) | |_) || | |   |  _|
-# | |___| | |_| |/ ___ \ ___) |  __/|  _ < | | |___| |___
-# |_____|_|\____/_/   \_\____/|_|   |_| \_\___\____|_____|
+#   _     ____   ____    _    ____  ____  ____  ___ ____ _____
+#  | |   |___ \ / ___|  / \  / ___||  _ \|  _ \|_ _/ ___| ____|
+#  | |     __) | |  _  / _ \ \___ \| |_) | |_) || | |   |  _|
+#  | |___ / __/| |_| |/ ___ \ ___) |  __/|  _ < | | |___| |___
+#  |_____|_____|\____/_/   \_\____/|_|   |_| \_\___\____|_____|
 #  ____  _   _  ____  ____ _____ ____ _____ _____ ____
 # / ___|| | | |/ ___|/ ___| ____/ ___|_   _| ____|  _ \
 # \___ \| | | | |  _| |  _|  _| \___ \ | | |  _| | |_) |