Merge branch 'main' into elmattic/fix-binary-reorg

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,11 +24,11 @@ Steps to reproduce the behavior:
 <!-- Please paste the log output derived from the error. -->
 <details>
   <summary>Log Output</summary>
-  
+
   ```Paste log output here
   paste log output...
   ```
-</details> 
+</details>
 
 
 
@@ -43,7 +43,7 @@ Steps to reproduce the behavior:
 
 
 **Environment (please complete the following information):**
- - OS: 
+ - OS:
  - Rust version(e.g. `rustc --version`)
  - Branch/commit
 

.github/ISSUE_TEMPLATE/config.yml

@@ -8,4 +8,4 @@ contact_links:
       about: Please ask and answer questions here.
     - name: ChainSafe Forest Implementation Forum
       url: https://discord.gg/Q6A3YA2
-      about: Please ask forest specific questions here.      
+      about: Please ask forest specific questions here.

.github/ISSUE_TEMPLATE/new_issue.md

@@ -31,4 +31,4 @@ assignees: ''
 <!-- Add any other context, existing implementation reference or screenshots about the task here. -->
 
 
-<!-- Thank you 💪 -->
+<!-- Thank you 💪 -->

.github/ISSUE_TEMPLATE/task_req.md

@@ -1,6 +1,6 @@
 ---
 name: Task requirement
-about: Required tasks to complete 
+about: Required tasks to complete
 title: ''
 labels: 'Status: Needs Triage'
 assignees: ''
@@ -14,7 +14,7 @@ assignees: ''
 
 **Specification reference**
 <!-- Provide a reference to the specification as to what is being implemented. -->
-- 
+-
 
 
 
@@ -23,4 +23,4 @@ assignees: ''
 
 
 
-<!-- Thank you 💪 -->
+<!-- Thank you 💪 -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,18 @@
 **Summary of changes**
 Changes introduced in this pull request:
-- 
+-
 
 
 
 **Reference issue to close (if applicable)**
 <!-- Include the issue reference this pull request is connected to -->
 <!--(e.g. Closes #1)-->
-Closes 
+Closes
 
 
 **Other information and links**
 <!-- Add any other context about the pull request here. -->
 
 
 
-<!-- Thank you 🔥 -->
+<!-- Thank you 🔥 -->

.github/workflows/check-archival-snapshots-generate.yml

@@ -11,7 +11,7 @@ jobs:
   run-checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - working-directory: 'archival-snapshots-generate'
         run: |
           cargo fmt --check

.github/workflows/deploy-benchmark.yml

@@ -6,15 +6,15 @@ on:
   pull_request:
     branches:
       - main
-    paths: 
-      - 'terraform/benchmark/**' 
-      - 'terraform/modules/benchmark/**' 
+    paths:
+      - 'terraform/benchmark/**'
+      - 'terraform/modules/benchmark/**'
   push:
     branches:
       - main
-    paths: 
-      - 'terraform/forest-calibnet/**' 
-      - 'terraform/modules/filecoin_node/**' 
+    paths:
+      - 'terraform/benchmark/**'
+      - 'terraform/modules/benchmark/**'
 
 jobs:
   benchmark:
@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
        # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources

.github/workflows/deploy-daily-snapshot.yml

@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources
@@ -33,6 +33,8 @@ jobs:
           aws_access_key_id:  ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+          r2_access_key: ${{ secrets.R2_ACCESS_KEY }}
+          r2_secret_key: ${{ secrets.R2_SECRET_KEY }}
           slack_token: ${{ secrets.SLACK_TOKEN }}
           working_directory: terraform/daily_snapshot
           environment: Snapshot Service

.github/workflows/deploy-forest-calibnet.yml

@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
     # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources

.github/workflows/deploy-forest-mainnet.yml

@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
     # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources
@@ -38,4 +38,3 @@ jobs:
           new_relic_account_id: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
           nr_license_key: ${{ secrets.NR_LICENSE_KEY }}
           new_relic_api_key: ${{ secrets.NEW_RELIC_API_KEY }}
-

.github/workflows/deploy-lotus-mainnet.yml

@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
     # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources

.github/workflows/deploy-new-relic.yml

@@ -21,7 +21,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
     # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources
@@ -35,4 +35,3 @@ jobs:
           new_relic_account_id: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
           working_directory: terraform/new-relic
           environment: New Relic
-

.github/workflows/deploy-snapshot-function.yml

@@ -1,4 +1,4 @@
-name: Forest Calibnet 
+name: Forest Calibnet
 concurrency: ci-${{ github.ref }}
 
 on:
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2
@@ -51,7 +51,7 @@ jobs:
         working-directory: do_function/monitor_snapshots
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2
@@ -65,5 +65,4 @@ jobs:
 
       - name: Deploy Snapshot Checks function
         if: github.ref == 'refs/heads/main' && ( github.event_name == 'push' || github.event_name == 'workflow_dispatch' )
-        run: doctl serverless deploy . --remote-build 
-
+        run: doctl serverless deploy . --remote-build

.github/workflows/deploy-sync-check.yml

@@ -23,7 +23,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
        # Using Custom Composite action in ./composite-action/terraform folder
       - name: Composite Action for Deploying Terraform Resources

.github/workflows/hadolint-ci.yml

@@ -10,7 +10,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: hadolint/[email protected]
       with:

.github/workflows/lintingci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cache plugin dir
         uses: actions/cache@v3
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup terraform
         uses: hashicorp/setup-terraform@v2

.github/workflows/scripts-lint.yml

@@ -13,27 +13,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Run shellcheck
       uses: ludeeus/[email protected]
       env:
         SHELLCHECK_OPTS: --external-sources
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
       - name: Run rubocop
         run: |
           gem install rubocop --no-document
-          rubocop scripts/ terraform/modules/benchmark/ # TODO: Apply rubocop to terraform/modules/ 
+          rubocop scripts/ terraform/modules/benchmark/ # TODO: Apply rubocop to terraform/modules/
   run-js-linters:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: |
         yarn install
         yarn lint

.github/workflows/tests-daily-snapshot.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-    paths: 
+    paths:
       - daily_snapshot_terraform/**
   push:
     branches:
@@ -16,7 +16,7 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2'

.pre-commit-config.yaml

@@ -0,0 +1,39 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+    -   id: detect-private-key
+    -   id: detect-aws-credentials
+
+-   repo: https://github.com/Yelp/detect-secrets
+    rev: v1.4.0
+    hooks:
+    -   id: detect-secrets
+        args: ['--baseline', '.secrets.baseline']
+
+-   repo: local
+    hooks:
+    -   id: detect-dop
+        name: 'Detect Digital Ocean API Secret'
+        entry: 'dop_v1_[a-f0-9]{64}'
+        language: pygrep
+        types: [text, file]
+    -   id: detect-eu01
+        name: 'Detect Secret New Relic Secret Token'
+        entry: 'eu01[a-zA-Z0-9]{32}'
+        language: pygrep
+        types: [text, file]
+    -   id: detect-new-relic-secret-token
+        name: 'Detect New Relic API Token'
+        entry: 'NRAK-[A-Z0-9]{27}'
+        language: pygrep
+        types: [text, file]
+    -   id: detect-do
+        name: 'Detect DO Secret'
+        entry: 'DO[0-9]{2}[A-Z0-9]{16}'
+        language: pygrep
+        types: [text, file]