diff --git a/.Dockerignore b/.Dockerignore deleted file mode 100644 index 4a87485a0..000000000 --- a/.Dockerignore +++ /dev/null @@ -1,452 +0,0 @@ -### APP-SPECIFIC EXCLUSIONS ### -tools/** - -# Tests -**/network-config - -# Python -.pytest_cache -**/__pycache__ - -### GENERAL EXCLUSIONS ### - -### GitBook ### -# Node rules: -## Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -## Dependency directory -## Commenting this out is preferred by some people, see -## https://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git -node_modules - -# Book build output -_book - -# eBook build output -*.epub -*.mobi -*.pdf - - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# VS Code -.devcontainer -.vscode -.vscode-upload.json - -# IDEs -.idea/** -.idea_modules/** -.prettierrc - - -### LANGUAGE/FRAMEWORK SPECIFIC EXCLUSIONS ### - - -### Golang ### -# If you prefer the allow list template instead of the deny list, see community template: -# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore -# -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Dependency directories (remove the comment below to include it) -# vendor/ - -# Go workspace file -go.work - - -### Node/JavaScript ### -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp -.cache - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* - - -### Sass ### -.sass-cache/ -*.css.map -*.sass.map -*.scss.map - - -### Rust ### -# Generated by Cargo -# will have compiled files and executables -debug/ -target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk - -# MSVC Windows builds of rustc generate these, which store debugging information -*.pdb - - -### Terraform ### -# Local .terraform directories -**/.terraform/* - -# .tfstate files -*.tfstate -*.tfstate.* - -# Crash log files -crash.log -crash.*.log - -# Exclude all .tfvars files, which are likely to contain sensitive data, such as -# password, private keys, and other secrets. These should not be part of version -# control as they are data points which are potentially sensitive and subject -# to change depending on the environment. -*.tfvars -*.tfvars.json - -# Ignore override files as they are usually used to override resources locally and so -# are not checked in -override.tf -override.tf.json -*_override.tf -*_override.tf.json - -# Include override files you do wish to add to version control using negated pattern -# !example_override.tf - -# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan -# example: *tfplan* - -# Ignore CLI configuration files -.terraformrc -terraform.rc - - -### Python ### -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..5fef7439a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +# Exclude all Markdown files +**/*.md + +# Skip build/test folders +build-tools/ +installer/ +networks/ +tests/ + +# Skip Git-related folders +.github +.git diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..42b425a8e --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,42 @@ +################################# +# GitHub Dependabot Config info # +################################# + +version: 2 +updates: + + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for NPM + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for Docker + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for Golang + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for Terraform + - package-ecosystem: "terraform" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for Python + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afef4fd16..14d7ddd3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,19 +11,6 @@ defaults: jobs: - - unit-tests: - name: "Unit Tests" - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version: '1.17' - - - name: Run Golang unit tests - run: go test -v ./... build-binary: name: "Build node binary" @@ -38,14 +25,17 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '1.17' - - - uses: bufbuild/buf-setup-action@v1.7.0 - env: - BUF_TOKEN: ${{ secrets.BUF_TOKEN }} + go-version-file: ./go.mod + + - name: Run Golang unit tests + run: go test -v ./... + + # - uses: bufbuild/buf-setup-action@v1.7.0 + # env: + # BUF_TOKEN: ${{ secrets.BUF_TOKEN }} # Calls a section in Makefile > Makefile > make/proto.mk > protocgen.sh - - name: Generate golang code + - name: Generate Protobufs run: make proto-gen - name: Build node binary @@ -56,49 +46,52 @@ jobs: uses: actions/upload-artifact@v3 with: name: cheqd-noded - path: build-tools/cheqd-noded + path: build/cheqd-noded - name: Set version number id: set-version run: | - VERSION=$(build-tools/cheqd-noded version 2>&1) + VERSION=$(build/cheqd-noded version 2>&1) echo ::set-output name=VERSION::"$VERSION" - build-docker-images: - name: "Docker images" + build-docker: + name: "Build Docker image" runs-on: ubuntu-latest env: - REGISTRY: ghcr.io + DOCKER_TEST_IMAGE: ${{ github.repository }}:test steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 # Required to fetch version - - - name: Generate golang code - run: make proto-gen - - - name: Build cheqd-cli Docker image 'cheqd-noded' as entrypoint - # TODO: Get rid of UID and GID - run: docker build --target base -t cheqd-cli -f docker/Dockerfile --build-arg UID="$(id -u)" --build-arg GID="$(id -g)" . + fetch-depth: 0 - - name: Build cheqd-node Docker image with 'node-start' as entrypoint - run: docker build --target node -t cheqd-node -f docker/Dockerfile --build-arg UID="$(id -u)" --build-arg GID="$(id -g)" . + - uses: actions/setup-go@v3 + with: + go-version-file: ./go.mod - - name: Save cheqd-cli Docker image - run: docker save -o cheqd-cli-image.tar cheqd-cli + - name: Generate Protobufs + run: make proto-gen - - name: Store cheqd-cli artifact - uses: actions/upload-artifact@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + id: buildx with: - name: cheqd-cli-image.tar - path: cheqd-cli-image.tar + install: true + version: latest - - name: Save cheqd-node Docker image - run: docker save -o cheqd-node-image.tar cheqd-node + - name: Build image + uses: docker/build-push-action@v3 + with: + context: . + file: docker/Dockerfile + platforms: linux/amd64 + load: true + target: runner + tags: ${{ env.DOCKER_TEST_IMAGE }} + outputs: type=docker,dest=/tmp/cheqd-node-image.tar - - name: Store cheqd-node artifact + - name: Store Docker test image artifact uses: actions/upload-artifact@v3 with: name: cheqd-node-image.tar - path: cheqd-node-image.tar + path: /tmp/cheqd-node-image.tar diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cc085cdde..0b7e9adad 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '1.17' + go-version-file: ./go.mod - uses: bufbuild/buf-setup-action@v1.7.0 env: diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index a47827e93..abc64c8eb 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -7,15 +7,15 @@ concurrency: jobs: - # call-lint: - # name: "Lint" - # uses: ./.github/workflows/lint.yml + call-lint: + name: "Lint" + uses: ./.github/workflows/lint.yml - # call-build: - # name: "Build" - # needs: call-lint - # uses: ./.github/workflows/build.yml - # secrets: inherit + call-build: + name: "Build" + needs: call-lint + uses: ./.github/workflows/build.yml + secrets: inherit # call-test: # name: "Test" @@ -24,10 +24,11 @@ jobs: # with: # VERSION: ${{ needs.call-build.outputs.VERSION }} - call-release: - name: "Release" - # needs: [call-test, call-build] - if: startsWith(github.ref, 'refs/tags/v') - uses: ./.github/workflows/release.yml - with: - RELEASE_VERSION: ${{ needs.call-build.outputs.VERSION }} + # call-release: + # name: "Release" + # # needs: [call-test, call-build] + # needs: call-build + # if: ${{ github.ref_protected == true }} + # uses: ./.github/workflows/release.yml + # with: + # RELEASE_VERSION: ${{ needs.call-build.outputs.VERSION }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 132809520..adc2ee4d6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '1.17' + go-version-file: ./go.mod - name: Run golangci-lint uses: golangci/golangci-lint-action@v3 @@ -72,7 +72,7 @@ jobs: VALIDATE_BASH: true VALIDATE_DOCKERFILE_HADOLINT: true - DOCKERFILE_HADOLINT_FILE_NAME: '../linters/.hadolint.yml' + VALIDATE_ENV: true VALIDATE_GITHUB_ACTIONS: true VALIDATE_JSON: true VALIDATE_MARKDOWN: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 771f49ce9..c2fdf826c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: run: | set -euo pipefail bash gen-network-config.sh - CHEQD_NODE_IMAGE=cheqd-node CHEQD_NODE_VERSION=latest docker compose up -d + CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d - name: Check all Docker localnet nodes are active run: | @@ -99,7 +99,7 @@ jobs: working-directory: ./docker/localnet run: | bash gen-network-config.sh - CHEQD_NODE_IMAGE=cheqd-node CHEQD_NODE_VERSION=latest docker compose up -d + CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d - name: Check all Docker localnet nodes are active run: bash tests/tools/wait-for-chain.sh @@ -161,7 +161,7 @@ jobs: working-directory: ./docker/localnet run: | bash gen-network-config.sh - CHEQD_NODE_IMAGE=cheqd-node CHEQD_NODE_VERSION=latest docker compose up -d + CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d - name: Check all Docker localnet nodes are active run: bash ./tests/tools/wait-for-chain.sh @@ -190,10 +190,10 @@ jobs: - name: Download cheqd-cli Docker image uses: actions/download-artifact@v3 with: - name: cheqd-cli-image.tar + name: cheqd-node-image.tar - name: Load cheqd-cli Docker image - run: docker load -i cheqd-cli-image.tar + run: docker load -i cheqd-node-image.tar - name: Give current user ownership run: sudo chown "$USER":"$USER" . @@ -224,10 +224,10 @@ jobs: - name: Download cheqd-cli Docker image uses: actions/download-artifact@v3 with: - name: cheqd-cli-image.tar + name: cheqd-node-image.tar - name: Load cheqd-cli Docker image - run: docker load -i cheqd-cli-image.tar + run: docker load -i cheqd-node-image.tar - name: Install cheqd-noded binary working-directory: ./tests/e2e-complex/upgrade/cosmovisor diff --git a/Makefile b/Makefile index 09a278cb4..eadfcfea7 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,14 @@ export GO111MODULE=on -BUILD_DIR ?= $(CURDIR)/build-tools +BUILD_DIR ?= $(CURDIR)/build CHEQD_DIR := $(CURDIR)/cmd/cheqd-noded BRANCH := $(shell git rev-parse --abbrev-ref HEAD) COMMIT := $(shell git log -1 --format='%H') ifeq (,$(VERSION)) - VERSION := $(shell echo $(shell git describe --always --tag --match "v*") | sed 's/^v//') + VERSION := $(shell git describe --exact-match 2>/dev/null) ifeq (,$(VERSION)) VERSION := $(BRANCH)-$(COMMIT) endif diff --git a/docker/Dockerfile b/docker/Dockerfile index c22da0259..48123fae2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,133 +4,49 @@ FROM golang:1.17-alpine AS builder -RUN apk update && apk add --no-cache \ - curl \ - git \ - bash \ - make \ - gcc \ - libc-dev \ - linux-headers +# Install minimum necessary dependencies +ENV PACKAGES curl make git libc-dev bash gcc linux-headers +RUN apk update && apk add --no-cache $PACKAGES -# Copy pre-requisites before building the node binary -WORKDIR /app +# Set working directory for the build +WORKDIR /go/src/github.com/cheqd/cheqd-node -COPY app ./app -COPY cmd ./cmd -COPY scripts ./scripts -COPY proto ./proto -COPY make ./make -COPY x ./x -COPY go.mod . -COPY go.sum . -COPY Makefile . -# Required to fetch version -COPY .git . +# Add source files +COPY . . # Make node binary -RUN make build +RUN make install && make build ############################################################### -### STAGE 2: Build cheqd binary base container ### +### STAGE 2: Build cheqd-node image ### ############################################################### -FROM alpine:3.16 AS base +FROM alpine:3.16 AS runner -LABEL org.opencontainers.image.description "cheqd CLI Docker image" -LABEL org.opencontainers.image.source "https://github.com/cheqd/cheqd-node" -LABEL org.opencontainers.image.documentation "https://docs.cheqd.io/node" +# Install pre-requisites +RUN apk update && apk add --no-cache bash ca-certificates -# Copy compiled node binary from Stage 1 -COPY --from=builder /app/build-tools/cheqd-noded /bin +# Copy over binaries from the build-env +COPY --from=builder /go/src/github.com/cheqd/cheqd-node/build/cheqd-noded /bin/cheqd-noded # Set user directory and details -ARG CHEQD_HOME_DIR="/home/cheqd" -ARG UID=1000 -ARG GID=1000 - -# Install pre-requisites -RUN apk update && apk add --no-cache \ - bash \ - ca-certificates +ARG HOME_DIR="/home/cheqd" +ARG USER="cheqd" # Add cheqd user to use in the container -RUN addgroup -S -g $GID cheqd \ - && adduser -S -h ${CHEQD_HOME_DIR} -s /bin/bash -G cheqd -u $UID cheqd - -WORKDIR ${CHEQD_HOME_DIR} -USER cheqd - -# Document default ports to expose to host -EXPOSE 26656 26657 26660 1317 9090 9091 - -# Define stop scenarios -STOPSIGNAL SIGTERM - -# Default entrypoint for cheqd-noded CLI usage -ENTRYPOINT [ "cheqd-noded" ] - +RUN addgroup --system ${USER} \ + && adduser ${USER} --system --home ${HOME_DIR} --shell /bin/bash -############################################################### -### STAGE 3: Build cheqd-node image ### -############################################################### - -FROM base AS node - -LABEL org.opencontainers.image.description "cheqd Node Docker image" -LABEL org.opencontainers.image.source "https://github.com/cheqd/cheqd-node" -LABEL org.opencontainers.image.documentation "https://docs.cheqd.io/node" - -# Set runner script +# Set entrypoint script COPY --chown=cheqd:cheqd docker/entrypoint.sh /bin/node-start RUN chmod +x /bin/node-start -# Default entrypoint for cheqd-noded CLI usage -ENTRYPOINT [ "node-start" ] - - -############################################################### -### STAGE 4: Build Cosmovisor ### -############################################################### - -FROM golang:1.17-alpine AS cosmos_builder - -RUN apk update && apk add --no-cache git - -RUN git clone https://github.com/cosmos/cosmos-sdk.git - -RUN apk add \ - bash \ - make \ - gcc \ - libc-dev \ - linux-headers +# Set working directory & bash defaults +WORKDIR ${HOME_DIR} +USER ${USER} +SHELL ["/bin/bash", "-euo", "pipefail", "-c"] -WORKDIR /go/cosmos-sdk/ - -RUN git status \ - && git checkout cosmovisor/v1.1.0 \ - && make cosmovisor - - -############################################################### -### STAGE 5: Cosmovisor-based node image ### -############################################################### - -FROM base AS cosmovisor - -COPY --from=cosmos_builder /go/cosmos-sdk/cosmovisor/cosmovisor /bin -COPY --chown=cheqd:cheqd docker/cosmovisor.sh /bin/cosmovisor.sh - -ARG CHEQD_HOME_DIR="/home/cheqd" - -RUN chmod +x /bin/cosmovisor.sh - -USER cheqd - -ENV DAEMON_HOME=${CHEQD_HOME_DIR}/.cheqdnode -ENV DAEMON_NAME=cheqd-noded -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=true -ENV DAEMON_RESTART_AFTER_UPGRADE=true +EXPOSE 26656 26657 26660 1317 9090 9091 -ENTRYPOINT [ "cosmovisor.sh" ] +# Set plain vanilla default entrypoint/command +CMD [ "cheqd-noded" ] diff --git a/docker/cosmovisor.sh b/docker/cosmovisor.sh deleted file mode 100644 index 007643e56..000000000 --- a/docker/cosmovisor.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -euo pipefail - -COSMOVISOR_ROOT_DIR="${HOME}"/.cheqdnode/cosmovisor - -mkdir -p "${HOME}"/.cheqdnode -mkdir -p "${COSMOVISOR_ROOT_DIR}" -mkdir -p "${COSMOVISOR_ROOT_DIR}"/genesis -mkdir -p "${COSMOVISOR_ROOT_DIR}"/genesis/bin/ -mkdir -p "${COSMOVISOR_ROOT_DIR}"/upgrades - -cp /bin/cheqd-noded "${COSMOVISOR_ROOT_DIR}"/genesis/bin/ - -cosmovisor "$@" \ No newline at end of file diff --git a/docker/localnet/docker-compose.env b/docker/localnet/docker-compose.env index d5f7bae95..c5d584c65 100644 --- a/docker/localnet/docker-compose.env +++ b/docker/localnet/docker-compose.env @@ -9,4 +9,4 @@ CHEQD_NODE_IMAGE="ghcr.io/cheqd/cheqd-node" # Define cheqd-noded software release version # Current MAINNET recommended version: v0.5.0 # Current TESTNET recommended version: v0.5.0 -CHEQD_NODE_VERSION="0.5.0" +DOCKER_IMAGE_VERSION="0.5.0" diff --git a/docker/localnet/docker-compose.yml b/docker/localnet/docker-compose.yml index bdedbfa4b..3e6973ba9 100644 --- a/docker/localnet/docker-compose.yml +++ b/docker/localnet/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: validator-0: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 26656 # Tendermint peer-to-peer (P2P) port @@ -33,7 +33,7 @@ services: target: /priv_validator_key validator-1: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 26756 # Tendermint peer-to-peer (P2P) port @@ -64,7 +64,7 @@ services: target: /priv_validator_key validator-2: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 26856 # Tendermint peer-to-peer (P2P) port @@ -95,7 +95,7 @@ services: target: /priv_validator_key validator-3: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 26956 # Tendermint peer-to-peer (P2P) port @@ -126,7 +126,7 @@ services: target: /priv_validator_key seed-0: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 27056 # Tendermint peer-to-peer (P2P) port @@ -157,7 +157,7 @@ services: target: /priv_validator_key observer-0: - image: ${CHEQD_NODE_IMAGE}:${CHEQD_NODE_VERSION} + image: ${CHEQD_NODE_IMAGE}:${DOCKER_IMAGE_VERSION} ports: - target: 26656 published: 27156 # Tendermint peer-to-peer (P2P) port diff --git a/docker/persistent-chains/container.env b/docker/persistent-chains/container.env index f95bf08c7..c6fe0a6ef 100644 --- a/docker/persistent-chains/container.env +++ b/docker/persistent-chains/container.env @@ -10,7 +10,7 @@ CHEQD_NODED_P2P_EXTERNAL_ADDRESS=":26656" # A custom human-readable name for this node -CHEQD_NODED_MONIKER="" +CHEQD_NODED_MONIKER="moniker-placeholder" ############################################################### ### OPTIONAL: Per-node safe defaults ### diff --git a/docker/persistent-chains/docker-compose.env b/docker/persistent-chains/docker-compose.env index c147e8b63..8c09a8618 100644 --- a/docker/persistent-chains/docker-compose.env +++ b/docker/persistent-chains/docker-compose.env @@ -11,9 +11,9 @@ CHEQD_NETWORK="mainnet" # Define cheqd-noded software release version -# Current MAINNET recommended version: v0.5.0 -# Current TESTNET recommended version: v0.5.0 -CHEQD_NODE_VERSION="0.5.0" +# Current MAINNET recommended version: v0.6.0 +# Current TESTNET recommended version: v0.6.0 +DOCKER_IMAGE_VERSION="0.6.0" ############################################################### @@ -66,11 +66,5 @@ CHEQD_DOCKER_VOLUME_IS_EXTERNAL="false" # Home directory for cheqd user inside the container CHEQD_HOME_DIR="/home/cheqd" -# UID for cheqd user -UID=1000 - -# GID for cheqd user -GID=1000 - # Build tag when rebuilding image BUILD_TAG="local" diff --git a/docker/persistent-chains/docker-compose.yml b/docker/persistent-chains/docker-compose.yml index fc5dc99c6..225fa5240 100644 --- a/docker/persistent-chains/docker-compose.yml +++ b/docker/persistent-chains/docker-compose.yml @@ -1,8 +1,8 @@ -version: '3.7' +version: '3.8' # CAUTION: Please ensure you edit necessary values in container.env and docker-compose.env before using this Docker Compose file. -# SYNTAX: docker-compose -f docker/persistent-chains/docker-compose.yml --env-file docker/persistent-chains/docker-compose.env up --no-build +# SYNTAX: docker compose -f docker/persistent-chains/docker-compose.yml --env-file docker/persistent-chains/docker-compose.env up --detach --no-build services: cheqd_node: @@ -10,16 +10,15 @@ services: # Default is to pull in the pre-published image on GitHub Container Registry # SYNTAX: docker-compose -f docker/persistent-chains/docker-compose.yml --env-file docker/persistent-chains/docker-compose.env build --no-cache # build: - # context: ../.. - # dockerfile: docker/Dockerfile - # target: node - # args: - # CHEQD_HOME_DIR: ${CHEQD_HOME_DIR} - # UID: ${UID} - # GID: ${GID} - # CAUTION: Change CHEQD_NODE_VERSION to local in docker-compose.env if building your own image in section below - # image: cheqd-node-custom-build:${CHEQD_NODE_VERSION} - image: ghcr.io/cheqd/cheqd-node:${CHEQD_NODE_VERSION} + # context: . + # dockerfile: docker/Dockerfile + # target: runner + # args: + # HOME_DIR: ${CHEQD_HOME_DIR} + # USER: cheqd + # CAUTION: Change DOCKER_IMAGE_VERSION to local in docker-compose.env if building your own image in section below + # image: cheqd-node-custom-build:${DOCKER_IMAGE_VERSION} + image: ghcr.io/cheqd/cheqd-node:${DOCKER_IMAGE_VERSION} user: cheqd configs: - source: genesis @@ -67,11 +66,23 @@ services: # Defines cheqd-noded configuration variables INSIDE the container env_file: - container.env + entrypoint: [ "node-start" ] + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:26657/status"] + interval: 5m + timeout: 10s + retries: 3 + start_period: 1m + restart: unless-stopped volumes: - type: volume source: ${CHEQD_DOCKER_VOLUME_SOURCE} # Defaults to cheqd_volume, defined below - target: /home/cheqd # Do NOT change mount point inside the container unless rebuilding the image - entrypoint: [ "node-start" ] + target: ${CHEQD_HOME_DIR} # Do NOT change mount point inside the container unless rebuilding the image configs: genesis: diff --git a/go.mod b/go.mod index 4f5bc5eb3..dd464baa2 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( filippo.io/edwards25519 v1.0.0-beta.2 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cosmos/cosmos-sdk v0.45.5 - github.com/cosmos/gogoproto v1.4.0 github.com/cosmos/ibc-go/v3 v3.1.0 github.com/gabriel-vasile/mimetype v1.4.0 github.com/go-ozzo/ozzo-validation/v4 v4.3.0 diff --git a/go.sum b/go.sum index c6a66cce9..678c77e28 100644 --- a/go.sum +++ b/go.sum @@ -222,8 +222,6 @@ github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/Tv github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.0 h1:yvu8ibdNep6zoIWn8go9jsYcjN8N3Yk+10tEZPWni38= -github.com/cosmos/gogoproto v1.4.0/go.mod h1:PmDilxjma3Cp50k5beXFV3ATB4O3/Sys4WI6Fo9kMAo= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= @@ -469,7 +467,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= @@ -573,7 +570,6 @@ github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1C github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/protoreflect v1.9.0 h1:npqHz788dryJiR/l6K/RUQAyh2SwV91+d1dnh4RjO9w= -github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= @@ -737,7 +733,6 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -753,7 +748,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -786,11 +780,6 @@ github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -1009,7 +998,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -1076,7 +1064,6 @@ golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1122,7 +1109,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1183,7 +1169,6 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= @@ -1309,11 +1294,9 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 h1:A9i04dxx7Cribqbs8jf3FQLogkL/CV2YN7hj9KWJCkc= golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1381,10 +1364,8 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -1402,7 +1383,6 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1519,8 +1499,6 @@ google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= @@ -1536,7 +1514,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/make/proto.mk b/make/proto.mk index 7b67d764e..89dc1d19c 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -6,9 +6,9 @@ containerProtoVer=v0.7 containerProtoImage=tendermintdev/sdk-proto-gen:$(containerProtoVer) -containerProtoGen=regen-ledger-proto-gen-$(containerProtoVer) -containerProtoFmt=regen-ledger-proto-fmt-$(containerProtoVer) -containerProtoGenSwagger=regen-ledger-proto-gen-swagger-$(containerProtoVer) +containerProtoGen=cheqd-node-proto-gen-$(containerProtoVer) +containerProtoFmt=cheqd-node-proto-fmt-$(containerProtoVer) +containerProtoGenSwagger=cheqd-node-proto-gen-swagger-$(containerProtoVer) proto-all: proto-lint proto-format proto-gen proto-check-breaking