From f49d875775287ef42153c191142520bf4f192c00 Mon Sep 17 00:00:00 2001 From: Steven Sheehy Date: Mon, 21 Jun 2021 11:01:57 -0500 Subject: [PATCH] Rename references from master to main Signed-off-by: Steven Sheehy --- .github/PULL_REQUEST_TEMPLATE.md | 3 +- .github/workflows/auto-release.yml | 10 +- .github/workflows/charts.yml | 6 +- .github/workflows/grpc-api.yml | 2 +- .github/workflows/importer.yml | 2 +- .github/workflows/monitor.yml | 2 +- .github/workflows/release-integration.yml | 6 +- .github/workflows/rest-api.yml | 2 +- .github/workflows/rosetta-api.yml | 2 +- .github/workflows/security.yml | 2 +- .github/workflows/windows.yml | 2 +- CONTRIBUTING.md | 179 +++++++++--------- README.md | 14 +- charts/hedera-mirror-common/Chart.yaml | 2 +- charts/hedera-mirror-grpc/Chart.yaml | 2 +- charts/hedera-mirror-importer/Chart.yaml | 2 +- charts/hedera-mirror-monitor/Chart.yaml | 2 +- charts/hedera-mirror-rest/Chart.yaml | 2 +- charts/hedera-mirror/Chart.yaml | 2 +- .../hedera-mirror/templates/application.yaml | 4 +- charts/marketplace/gcp/schema.yaml | 2 +- docker-compose.yml | 10 +- .../config/HibernateConfiguration.java | 8 +- pom.xml | 6 +- 24 files changed, 142 insertions(+), 132 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index defa2ed6b38..54a13d92c1b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ 1. Read our CONTRIBUTING.md guide 2. Name your PR as `: 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 # **Special notes for your reviewer**: **Checklist** + - [ ] Documentation added - [ ] Tests updated diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index dfdfd1fa36e..708de1bcb5f 100644 --- a/.github/workflows/auto-release.yml +++ b/.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 diff --git a/.github/workflows/charts.yml b/.github/workflows/charts.yml index ba000f38695..e6a15c82c47 100644 --- a/.github/workflows/charts.yml +++ b/.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 diff --git a/.github/workflows/grpc-api.yml b/.github/workflows/grpc-api.yml index ffe99723003..7a6aeee503e 100644 --- a/.github/workflows/grpc-api.yml +++ b/.github/workflows/grpc-api.yml @@ -2,7 +2,7 @@ name: "gRPC API" on: pull_request: - branches: [ master, release/** ] + branches: [ main, release/** ] push: tags: [ v* ] diff --git a/.github/workflows/importer.yml b/.github/workflows/importer.yml index 4b4c9e023fa..ce26c8f7647 100644 --- a/.github/workflows/importer.yml +++ b/.github/workflows/importer.yml @@ -2,7 +2,7 @@ name: "Importer" on: pull_request: - branches: [ master, release/** ] + branches: [ main, release/** ] push: tags: [ v* ] diff --git a/.github/workflows/monitor.yml b/.github/workflows/monitor.yml index 0a9d9d83f22..165b2516e9d 100644 --- a/.github/workflows/monitor.yml +++ b/.github/workflows/monitor.yml @@ -2,7 +2,7 @@ name: "Monitor" on: pull_request: - branches: [ master, release/** ] + branches: [ main, release/** ] push: tags: [ v* ] diff --git a/.github/workflows/release-integration.yml b/.github/workflows/release-integration.yml index 392ce9cbdd0..f6a034ab85c 100644 --- a/.github/workflows/release-integration.yml +++ b/.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 }} diff --git a/.github/workflows/rest-api.yml b/.github/workflows/rest-api.yml index 6029388932c..3e207e4a631 100644 --- a/.github/workflows/rest-api.yml +++ b/.github/workflows/rest-api.yml @@ -2,7 +2,7 @@ name: "REST API" on: pull_request: - branches: [ master, release/** ] + branches: [ main, release/** ] push: tags: [ v* ] diff --git a/.github/workflows/rosetta-api.yml b/.github/workflows/rosetta-api.yml index 14dae9dc48f..868c7af5795 100644 --- a/.github/workflows/rosetta-api.yml +++ b/.github/workflows/rosetta-api.yml @@ -2,7 +2,7 @@ name: Rosetta API on: pull_request: - branches: [ master, release/** ] + branches: [ main, release/** ] push: tags: [ v* ] diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 9aff6bece0f..164fa3007b1 100644 --- a/.github/workflows/security.yml +++ b/.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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bd603aa9984..6a5fff7d4bb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,7 @@ name: Windows on: pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d483f3a06ea..78efb5f501c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,10 @@ # Contributing Guidelines -The Hedera Mirror node accepts contributions via GitHub pull requests. This document outlines the -process to help get your contribution accepted. +The Hedera Mirror node accepts contributions via GitHub pull requests. This document outlines the process to help get +your contribution accepted. ## Contents + - [Support Channels](#support-channels) - [Issues](#issues) - [Vulnerability Disclosure](#vulnerability-disclosure) @@ -22,9 +23,9 @@ Whether you are a user or contributor, official support channels include: - [Issues](https://github.com/hashgraph/hedera-mirror-node/issues) - [Discord](https://discordapp.com/invite/FFb9YFX) -Before opening a new issue or submitting a new pull request, it's helpful to search the project - -it's likely that another user has already reported the issue you're facing, or it's a known issue -that we're already aware of. It is also worth asking on the Discord channels. +Before opening a new issue or submitting a new pull request, it's helpful to search the project - it's likely that +another user has already reported the issue you're facing, or it's a known issue that we're already aware of. It is also +worth asking on the Discord channels. ## Issues @@ -33,47 +34,45 @@ Issues are used as the primary method for tracking anything to do with the proje ### Vulnerability Disclosure Most of the time, when you find a bug, it should be reported using -[GitHub issues](https://github.com/hashgraph/hedera-mirror-node/issues). However, if -you are reporting a _security vulnerability_, please email a report to -[security@hedera.com](mailto:security@hedera.com). This will give -us a chance to try to fix the issue before it is exploited in the wild. +[GitHub issues](https://github.com/hashgraph/hedera-mirror-node/issues). However, if you are reporting a _security +vulnerability_, please email a report to +[security@hedera.com](mailto:security@hedera.com). This will give us a chance to try to fix the issue before it is +exploited in the wild. ### Issue Types -There are 3 types of issues (each with their own corresponding [label](https://github.com/hashgraph/hedera-mirror-node/labels)): +There are 3 types of issues (each with their own +corresponding [label](https://github.com/hashgraph/hedera-mirror-node/labels)): - **Bugs:** These track bugs with the code or problems with the documentation (i.e. missing or incomplete) -- **Features:** These track specific feature requests and ideas until they are complete. If the feature is -sufficiently large, complex or requires coordination among multiple Hedera projects, it should -first go through the [Hedera Improvement Proposal](https://github.com/hashgraph/hip) process. -- **Question:** These are support or functionality inquiries that we want to have a record of for -future reference. Generally these are questions that are too complex or large to store in the -Discord channel or have particular interest to the community as a whole. Depending on the discussion, -these can turn into a "Feature" or "Bug". +- **Features:** These track specific feature requests and ideas until they are complete. If the feature is sufficiently + large, complex or requires coordination among multiple Hedera projects, it should first go through + the [Hedera Improvement Proposal](https://github.com/hashgraph/hip) process. +- **Question:** These are support or functionality inquiries that we want to have a record of for future reference. + Generally these are questions that are too complex or large to store in the Discord channel or have particular + interest to the community as a whole. Depending on the discussion, these can turn into a "Feature" or "Bug". ### Issue Lifecycle -The issue lifecycle is mainly driven by the core maintainers, but is good information for those -contributing. All issue types follow the same general lifecycle. Differences are noted below. +The issue lifecycle is mainly driven by the core maintainers, but is good information for those contributing. All issue +types follow the same general lifecycle. Differences are noted below. 1. **Issue creation** 2. **Triage** - - The maintainer in charge of triaging will apply the proper labels for the issue. This - includes labels for priority and type. - - Clean up the title to succinctly and clearly state the issue (if needed). - - Add the issue to the correct milestone. - - We attempt to do this process at least once per work day. + - The maintainer in charge of triaging will apply the proper labels for the issue. This includes labels for priority + and type. + - Clean up the title to succinctly and clearly state the issue (if needed). + - Add the issue to the correct milestone. + - We attempt to do this process at least once per work day. 3. **Discussion** - - "Feature" and "Bug" issues should be connected to the PR that resolves it. - - Whoever is working on a "Feature" or "Bug" issue (whether a maintainer or someone from - the community), should either assign the issue to them self or make a comment in the issue - saying that they are taking it. - - "Question" issues should stay open until resolved or if they have not been - active for more than 30 days. This will help keep the issue queue to a manageable size and - reduce noise. + - "Feature" and "Bug" issues should be connected to the PR that resolves it. + - Whoever is working on a "Feature" or "Bug" issue (whether a maintainer or someone from the community), should either + assign the issue to them self or make a comment in the issue saying that they are taking it. + - "Question" issues should stay open until resolved or if they have not been active for more than 30 days. This will + help keep the issue queue to a manageable size and reduce noise. 4. **Issue closure** - - Issues should be closed when a PR is merged or closed manually by the submitter or maintainer - if it is determined that is not necessary. + - Issues should be closed when a PR is merged or closed manually by the submitter or maintainer if it is determined + that is not necessary. ## Pull Requests @@ -87,10 +86,13 @@ Go to the [project](https://github.com/hashgraph/hedera-mirror-node) page then h button to fork your own copy of the repository to your GitHub account. 2. Clone the forked repo to your local working directory. + ```sh -$ git clone https://github.com/$your_github_account/hedera-mirror-node.git +$ git clone https://github.com/$your_github_account/hedera-mirror-node.git ``` + 3. Add an `upstream` remote to keep your fork in sync with the main repo. + ```sh $ cd hedera-mirror-node $ git remote add upstream https://github.com/hashgraph/hedera-mirror-node.git @@ -101,36 +103,44 @@ origin https://github.com/$your_github_account/hedera-mirror-node.git (push) upstream https://github.com/hashgraph/hedera-mirror-node.git (fetch) upstream https://github.com/hashgraph/hedera-mirror-node.git (push) ``` -4. Sync your local `master` branch. + +4. Sync your local `main` branch. + ```sh -$ git pull upstream master +$ git pull upstream main ``` + 5. Create a branch to add a new feature or fix issues. + ```sh $ git checkout -b new-feature ``` + 6. Make any change on the branch `new-feature` then build and test your codes. 7. Include in what will be committed. + ```sh $ git add ``` -8. Use [sign-off](#sign-off) when making each of your commits. If you forgot to sign some commits -that are part of the contribution, you can ask [git to rewrite your commit history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). + +8. Use [sign-off](#sign-off) when making each of your commits. If you forgot to sign some commits that are part of the + contribution, you can + ask [git to rewrite your commit history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). + ```sh $ git commit --signoff -m "Your commit message" ``` + 9. [Submit](#pr-lifecycle) a pull request. ### Sign Off -The sign-off is a simple line at the end of commit message. All -commits needs to be signed. Your signature certifies that you wrote the code or -otherwise have the right to contribute the material. First, read the -[Developer Certificate of Origin](https://developercertificate.org/) (DCO) to -fully understand its terms. +The sign-off is a simple line at the end of commit message. All commits needs to be signed. Your signature certifies +that you wrote the code or otherwise have the right to contribute the material. First, read the +[Developer Certificate of Origin](https://developercertificate.org/) (DCO) to fully understand its terms. -Contributors sign-off that they adhere to these requirements by adding a Signed-off-by -line to commit messages (as seen via `git log`): +Contributors sign-off that they adhere to these requirements by adding a Signed-off-by line to commit messages (as seen +via `git log`): ``` Author: Joe Smith @@ -141,12 +151,11 @@ Date: Thu Feb 2 11:41:15 2018 -0800 Signed-off-by: Joe Smith ``` -Use your real name and email (sorry, no pseudonyms or anonymous contributions). -Notice the `Author` and `Signed-off-by` lines match. If they don't your PR will be -rejected by the automated DCO check. +Use your real name and email (sorry, no pseudonyms or anonymous contributions). Notice the `Author` and `Signed-off-by` +lines match. If they don't your PR will be rejected by the automated DCO check. -If you set your `user.name` and `user.email` git configs, you can sign your -commit automatically with `-s` command line option: +If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `-s` command line +option: ```sh $ git commit -s -m 'Update README' @@ -154,49 +163,47 @@ $ git commit -s -m 'Update README' ### PR Lifecycle -Now that you've got your [forked](#forking) branch and [signed off](#sign-off) any commits, you can proceed to submit it. +Now that you've got your [forked](#forking) branch and [signed off](#sign-off) any commits, you can proceed to submit +it. 1. **Submitting** - - It is preferred, but not required, to have a PR tied to a specific issue. There can be - circumstances where if it is a quick fix then an issue might be overkill. The details provided - in the PR description would suffice in this case. - - The PR description or commit message should contain a [keyword](https://help.github.com/en/articles/closing-issues-using-keywords) - to automatically close the related issue. - - Commits should be as small as possible, while ensuring that each commit is correct independently - (i.e., each commit should compile and pass tests). - - Add tests and documentation relevant to the fixed bug or new feature. - - We more than welcome PRs that are currently in progress. If a PR is a work in progress, - it should be opened as a [Draft PR](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests). - Once the PR is ready for review, mark it as ready to convert it to a regular PR. + - It is preferred, but not required, to have a PR tied to a specific issue. There can be circumstances where if it is + a quick fix then an issue might be overkill. The details provided in the PR description would suffice in this case. + - The PR description or commit message should contain + a [keyword](https://help.github.com/en/articles/closing-issues-using-keywords) + to automatically close the related issue. + - Commits should be as small as possible, while ensuring that each commit is correct independently + (i.e., each commit should compile and pass tests). + - Add tests and documentation relevant to the fixed bug or new feature. + - We more than welcome PRs that are currently in progress. If a PR is a work in progress, it should be opened as + a [Draft PR](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests). Once the PR is ready for + review, mark it as ready to convert it to a regular PR. 2. **Triage** - - The maintainer in charge of triaging will apply the proper labels for the issue. - - Add the PR to the correct milestone. This should be the same as the issue the PR closes. - - The maintainer can assign a reviewer or a reviewer can self assign themselves as a reviewer. + - The maintainer in charge of triaging will apply the proper labels for the issue. + - Add the PR to the correct milestone. This should be the same as the issue the PR closes. + - The maintainer can assign a reviewer or a reviewer can self assign themselves as a reviewer. 3. **Reviewing** - - All reviews will be completed using the Github review tool. - - A "Comment" review should be used when there are questions about the code that should be - answered, but that don't involve code changes. This type of review does not count as approval. - - A "Changes Requested" review indicates that changes to the code need to be made before they will be - merged. - - For documentation, special attention will be paid to spelling, grammar, and clarity - (whereas those things don't matter *as* much for comments in code). - - Reviews are also welcome from others in the community, especially those who have encountered a bug or - have requested a feature. In the code review, a message can be added, as well as `LGTM` if the PR is - good to merge. It’s also possible to add comments to specific lines in a file, for giving context - to the comment. - - PR owner should try to be responsive to comments by answering questions or changing code. If the - owner is unsure of any comment, reach out to the person who added the comment in Discord. Once all comments - have been addressed, the PR is ready to be merged. + - All reviews will be completed using the Github review tool. + - A "Comment" review should be used when there are questions about the code that should be answered, but that don't + involve code changes. This type of review does not count as approval. + - A "Changes Requested" review indicates that changes to the code need to be made before they will be merged. + - For documentation, special attention will be paid to spelling, grammar, and clarity + (whereas those things don't matter *as* much for comments in code). + - Reviews are also welcome from others in the community, especially those who have encountered a bug or have requested + a feature. In the code review, a message can be added, as well as `LGTM` if the PR is good to merge. It’s also + possible to add comments to specific lines in a file, for giving context to the comment. + - PR owner should try to be responsive to comments by answering questions or changing code. If the owner is unsure of + any comment, reach out to the person who added the comment in Discord. Once all comments have been addressed, the PR + is ready to be merged. 4. **Merge or Close** - - PRs should stay open until merged or be closed if the submitter has not been responsive for more than 30 days. - This will help keep the PR queue to a manageable size and reduce noise. + - PRs should stay open until merged or be closed if the submitter has not been responsive for more than 30 days. This + will help keep the PR queue to a manageable size and reduce noise. ## Releases -Hedera uses [Semantic Versioning](https://semver.org) for releases to convey meaning about the -underlying code and what has been modified from one version to the next. We use milestones to -track the progress of a release. Assigning issues to a milestone is on a best effort basis and -we make no guarantees as to when a particular issue will be released. A milestone (and hence -release) is considered done when all outstanding issues/PRs have been closed or moved to another +Hedera uses [Semantic Versioning](https://semver.org) for releases to convey meaning about the underlying code and what +has been modified from one version to the next. We use milestones to track the progress of a release. Assigning issues +to a milestone is on a best effort basis and we make no guarantees as to when a particular issue will be released. A +milestone (and hence release) is considered done when all outstanding issues/PRs have been closed or moved to another milestone. diff --git a/README.md b/README.md index b3eaf9352d3..d147f46745a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build](https://github.com/hashgraph/hedera-mirror-node/actions/workflows/importer.yml/badge.svg)](https://github.com/hashgraph/hedera-mirror-node/actions) -[![codecov](https://img.shields.io/codecov/c/github/hashgraph/hedera-mirror-node/master)](https://codecov.io/gh/hashgraph/hedera-mirror-node) +[![codecov](https://img.shields.io/codecov/c/github/hashgraph/hedera-mirror-node/main)](https://codecov.io/gh/hashgraph/hedera-mirror-node) [![GitHub](https://img.shields.io/github/license/hashgraph/hedera-mirror-node)](LICENSE) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://hedera.com/discord) @@ -79,15 +79,15 @@ to understanding the mirror node operations. - [Git](https://git-scm.com/about) - [Maven](https://maven.apache.org/guides/getting-started/index.html) - [Docker](https://docs.docker.com/) - - [docker-compose commands](https://docs.docker.com/compose/reference/overview/) - - [docker commands](https://docs.docker.com/engine/reference/commandline/docker/) + - [docker-compose commands](https://docs.docker.com/compose/reference/overview/) + - [docker commands](https://docs.docker.com/engine/reference/commandline/docker/) - [NodeJS](https://nodejs.org/en/about/) - [Spring](https://spring.io/quickstart) - - [Spring Boot](https://docs.spring.io/spring-boot/docs/current/reference/html/getting-started.html#getting-started) - - [Externalized Configurations](https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config) + - [Spring Boot](https://docs.spring.io/spring-boot/docs/current/reference/html/getting-started.html#getting-started) + - [Externalized Configurations](https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config) - [PostgreSQL](https://www.postgresql.org/docs/9.6/index.html) - - [SQL commands](https://www.postgresql.org/docs/9.6/sql-commands.html) - - [Client Application & Utilities](https://www.postgresql.org/docs/9.6/reference-client.html) + - [SQL commands](https://www.postgresql.org/docs/9.6/sql-commands.html) + - [Client Application & Utilities](https://www.postgresql.org/docs/9.6/reference-client.html) - [Go](https://golang.org/) ### Prerequisite Tools diff --git a/charts/hedera-mirror-common/Chart.yaml b/charts/hedera-mirror-common/Chart.yaml index cca4eaffa74..18ee2c69f09 100644 --- a/charts/hedera-mirror-common/Chart.yaml +++ b/charts/hedera-mirror-common/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" dependencies: - name: loki condition: loki.enabled diff --git a/charts/hedera-mirror-grpc/Chart.yaml b/charts/hedera-mirror-grpc/Chart.yaml index 168d56b1519..b13e653a5e0 100644 --- a/charts/hedera-mirror-grpc/Chart.yaml +++ b/charts/hedera-mirror-grpc/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" description: GRPC API for the Hedera Mirror Node home: https://github.com/hashgraph/hedera-mirror-node icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067 diff --git a/charts/hedera-mirror-importer/Chart.yaml b/charts/hedera-mirror-importer/Chart.yaml index be4b4a0287e..2dee443a795 100644 --- a/charts/hedera-mirror-importer/Chart.yaml +++ b/charts/hedera-mirror-importer/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" description: Hedera Mirror Importer downloads and validates file streams from the cloud and imports them into the database home: https://github.com/hashgraph/hedera-mirror-node icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067 diff --git a/charts/hedera-mirror-monitor/Chart.yaml b/charts/hedera-mirror-monitor/Chart.yaml index b4267e293aa..93b5ca7faf9 100644 --- a/charts/hedera-mirror-monitor/Chart.yaml +++ b/charts/hedera-mirror-monitor/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" description: End to End Monitor for the Hedera Mirror Node home: https://github.com/hashgraph/hedera-mirror-node icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067 diff --git a/charts/hedera-mirror-rest/Chart.yaml b/charts/hedera-mirror-rest/Chart.yaml index 53843551238..151464c70ca 100644 --- a/charts/hedera-mirror-rest/Chart.yaml +++ b/charts/hedera-mirror-rest/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" description: REST API for the Hedera Mirror Node home: https://github.com/hashgraph/hedera-mirror-node icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067 diff --git a/charts/hedera-mirror/Chart.yaml b/charts/hedera-mirror/Chart.yaml index 418b5403679..e7e9a81c881 100644 --- a/charts/hedera-mirror/Chart.yaml +++ b/charts/hedera-mirror/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "master" +appVersion: "main" dependencies: - alias: grpc condition: grpc.enabled diff --git a/charts/hedera-mirror/templates/application.yaml b/charts/hedera-mirror/templates/application.yaml index ef741dcc977..09f6659288d 100644 --- a/charts/hedera-mirror/templates/application.yaml +++ b/charts/hedera-mirror/templates/application.yaml @@ -48,7 +48,7 @@ spec: - description: Source Repository url: https://github.com/hashgraph/hedera-mirror-node - description: User Guide - url: https://github.com/hashgraph/hedera-mirror-node/blob/master/charts/marketplace/gcp/README.md + url: https://github.com/hashgraph/hedera-mirror-node/blob/main/charts/marketplace/gcp/README.md - description: Website url: https://hedera.com maintainers: @@ -68,4 +68,4 @@ spec: curl -s "http://${REST_IP}/api/v1/transactions?limit=1" type: hedera-mirror-node version: {{ default .Chart.AppVersion .Values.applicationResource.version | quote }} -{{- end }} + {{- end }} diff --git a/charts/marketplace/gcp/schema.yaml b/charts/marketplace/gcp/schema.yaml index 2e12e946fad..5ba5f0349b2 100644 --- a/charts/marketplace/gcp/schema.yaml +++ b/charts/marketplace/gcp/schema.yaml @@ -18,7 +18,7 @@ x-google-marketplace: publishedVersionMetadata: releaseNote: >- v0.27 brings many new features to the mirror node marketplace application since v0.13. - This upgrade includes breaking changes. Please refer to v0.27 Upgrade for additional upgrade steps. + This upgrade includes breaking changes. Please refer to v0.27 Upgrade for additional upgrade steps. The largest feature introduced since v0.13 is that of the Hedera Token Service (HTS) which allows for the creation and management of custom tokens on the Hedera network. Token entity types are now ingested to the DB and can be queried through new REST APIs. diff --git a/docker-compose.yml b/docker-compose.yml index d33e8afcb79..f31fc9264e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - 5432:5432 grpc: - image: gcr.io/mirrornode/hedera-mirror-grpc:master + image: gcr.io/mirrornode/hedera-mirror-grpc:main pull_policy: always restart: unless-stopped environment: @@ -39,7 +39,7 @@ services: - 5600:5600 importer: - image: gcr.io/mirrornode/hedera-mirror-importer:master + image: gcr.io/mirrornode/hedera-mirror-importer:main pull_policy: always restart: unless-stopped environment: @@ -53,7 +53,7 @@ services: monitor: deploy: replicas: 0 - image: gcr.io/mirrornode/hedera-mirror-monitor:master + image: gcr.io/mirrornode/hedera-mirror-monitor:main pull_policy: always restart: unless-stopped environment: @@ -71,7 +71,7 @@ services: - 6379:6379 rest: - image: gcr.io/mirrornode/hedera-mirror-rest:master + image: gcr.io/mirrornode/hedera-mirror-rest:main pull_policy: always environment: HEDERA_MIRROR_REST_DB_HOST: db @@ -81,7 +81,7 @@ services: - 5551:5551 rosetta: - image: gcr.io/mirrornode/hedera-mirror-rosetta:master + image: gcr.io/mirrornode/hedera-mirror-rosetta:main pull_policy: always environment: HEDERA_MIRROR_ROSETTA_DB_HOST: db diff --git a/hedera-mirror-importer/src/main/java/com/hedera/mirror/importer/config/HibernateConfiguration.java b/hedera-mirror-importer/src/main/java/com/hedera/mirror/importer/config/HibernateConfiguration.java index 204b3e38611..d3bd738f4e9 100644 --- a/hedera-mirror-importer/src/main/java/com/hedera/mirror/importer/config/HibernateConfiguration.java +++ b/hedera-mirror-importer/src/main/java/com/hedera/mirror/importer/config/HibernateConfiguration.java @@ -32,7 +32,7 @@ @Configuration public class HibernateConfiguration implements HibernatePropertiesCustomizer { @Override - public void customize(final Map hibernateProperties) { + public void customize(Map hibernateProperties) { hibernateProperties.put("hibernate.session_factory.interceptor", hibernateInterceptor()); } @@ -40,10 +40,12 @@ public void customize(final Map hibernateProperties) { public Interceptor hibernateInterceptor() { // https://www.pgpool.net/docs/latest/en/html/runtime-config-load-balancing.html // pgpool disables load balancing for SQL statements beginning with an arbitrary comment and sends them to the - // master / primary node. This is used to prevent the stale read-after-write issue. + // primary node. This is used to prevent the stale read-after-write issue. return new EmptyInterceptor() { + private static final long serialVersionUID = -2584591648084883933L; + @Override - public String onPrepareStatement(final String sql) { + public String onPrepareStatement(String sql) { return "/* NO PGPOOL LOAD BALANCE */\n" + sql; } }; diff --git a/pom.xml b/pom.xml index f3405ffc0e6..3a1678bae78 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ repo Apache License 2.0 - https://github.com/hashgraph/hedera-mirror-node/blob/master/LICENSE + https://github.com/hashgraph/hedera-mirror-node/blob/main/LICENSE @@ -90,8 +90,8 @@ https://github.com/hashgraph/hedera-mirror-node.git - master - https://github.com/hashgraph/hedera-mirror-node/tree/master + main + https://github.com/hashgraph/hedera-mirror-node/tree/main