Merge with main

Signed-off-by: Ian Jungmann <ian.jungmann@hedera.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 1. Read our CONTRIBUTING.md guide
 2. Name your PR as `<Feature Area>: Describe your change`
-3. Rebase your PR if it gets out of sync with master
+3. Rebase your PR if it gets out of sync with main
 -->
 
 **Detailed description**:
@@ -13,6 +13,7 @@ Fixes #<issue number>
 **Special notes for your reviewer**:
 
 **Checklist**
+
 - [ ] Documentation added
 - [ ] Tests updated
 

.github/workflows/auto-release.yml

@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          ref: master
+          ref: main
           token: ${{ secrets.HEDERA_BOT_TOKEN }}
 
       - name: Import GPG Key
@@ -94,7 +94,7 @@ jobs:
             git checkout -b ${RELEASE_BRANCH}
             git push -u origin ${RELEASE_BRANCH}
 
-            # create a PR to bump master version to the next snapshot version
+            # create a PR to bump main branch to the next snapshot version
             echo "CREATE_PR=true" >> $GITHUB_ENV
             echo "PR_TITLE=Bump versions for v$NEXT_VERSION_SNAPSHOT" >> $GITHUB_ENV
           else
@@ -160,7 +160,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v2
         with:
-          ref: master
+          ref: main
 
       - name: Import GPG Key
         id: gpg_importer
@@ -179,13 +179,13 @@ jobs:
           path: ~/.m2
           restore-keys: ${{ runner.os }}-m2
 
-      - name: Reset Master to Release Branch
+      - name: Reset main to release branch
         run: |
           git fetch origin $RELEASE_BRANCH:$RELEASE_BRANCH
           git reset --hard $RELEASE_BRANCH
 
       - name: Maven Release for Next Minor Snapshot
-        run: ./mvnw clean package $MAVEN_CLI_OPTS -Drelease.version=$NEXT_VERSION_SNAPSHOT -Drelease.chartVersion=$NEXT_CHART_VERSION_SNAPSHOT -Ddocker.tag.version=master -N -P=release
+        run: ./mvnw clean package $MAVEN_CLI_OPTS -Drelease.version=$NEXT_VERSION_SNAPSHOT -Drelease.chartVersion=$NEXT_CHART_VERSION_SNAPSHOT -Ddocker.tag.version=main -N -P=release
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3

.github/workflows/charts.yml

@@ -2,7 +2,7 @@ name: Charts
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 
@@ -31,14 +31,14 @@ jobs:
           fetch-depth: 0
 
       - name: Build images
-        run: ./mvnw ${MAVEN_CLI_OPTS} install -pl hedera-mirror-grpc,hedera-mirror-importer,hedera-mirror-rest --also-make -Dskip.npm -DskipTests -Ddocker.tag.version=master
+        run: ./mvnw ${MAVEN_CLI_OPTS} install -pl hedera-mirror-grpc,hedera-mirror-importer,hedera-mirror-rest --also-make -Dskip.npm -DskipTests -Ddocker.tag.version=main
 
       - name: Create k3d cluster
         run: |
           set -ex
           curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
           k3d cluster create mirror --agents 1 --timeout 5m
-          k3d image import -c mirror "gcr.io/mirrornode/hedera-mirror-grpc:master" "gcr.io/mirrornode/hedera-mirror-importer:master" "gcr.io/mirrornode/hedera-mirror-rest:master"
+          k3d image import -c mirror "gcr.io/mirrornode/hedera-mirror-grpc:main" "gcr.io/mirrornode/hedera-mirror-importer:main" "gcr.io/mirrornode/hedera-mirror-rest:main"
 
       - name: Install ct
         uses: helm/chart-testing-action@v2.0.1

.github/workflows/grpc-api.yml

@@ -2,7 +2,7 @@ name: "gRPC API"
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 

.github/workflows/importer.yml

@@ -2,7 +2,7 @@ name: "Importer"
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 

.github/workflows/monitor.yml

@@ -2,7 +2,7 @@ name: "Monitor"
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 

.github/workflows/release-integration.yml

@@ -2,7 +2,7 @@ name: Release Integration
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   publish:
@@ -29,7 +29,7 @@ jobs:
         run: gcloud auth configure-docker gcr.io,marketplace.gcr.io
 
       - name: Build and push images
-        run: ./mvnw ${MAVEN_CLI_OPTS} deploy -DskipTests -Ddocker.tag.version=master
+        run: ./mvnw ${MAVEN_CLI_OPTS} deploy -DskipTests -Ddocker.tag.version=main
 
   deploy:
     needs: publish
@@ -44,4 +44,4 @@ jobs:
 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Upgrade integration to master ${{ github.sha }}
+          commit_message: Upgrade integration to main ${{ github.sha }}

.github/workflows/rest-api.yml

@@ -2,7 +2,7 @@ name: "REST API"
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 

.github/workflows/rosetta-api.yml

@@ -2,7 +2,7 @@ name: Rosetta API
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
   push:
     tags: [ v* ]
 

.github/workflows/security.yml

@@ -2,7 +2,7 @@ name: Security
 
 on:
   pull_request:
-    branches: [ master, release/** ]
+    branches: [ main, release/** ]
 
 env:
   MAVEN_CLI_OPTS: --batch-mode --no-transfer-progress

.github/workflows/windows.yml

@@ -2,7 +2,7 @@ name: Windows
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build: