Skip to content

Commit

Permalink
Merge pull request #1899 from provenance-io/dwedul/v50-merge-main-1
Browse files Browse the repository at this point in the history
Merge branch 'main' into main-v0.50
  • Loading branch information
SpicyLemon authored Apr 2, 2024
2 parents fa05e85 + a46d227 commit 0bd746c
Show file tree
Hide file tree
Showing 198 changed files with 75,881 additions and 10,598 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: dangoslen/dependabot-changelog-helper@v3
with:
version: ${{ needs.setup.outputs.version }}
activationLabel: 'dependencies'
activationLabels: 'dependencies'
changelogPath: './CHANGELOG.md'

# This step is required for committing the changes to your branch.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -60,7 +60,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -74,4 +74,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetch-depth: 0

- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.21'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
go.sum
.github/workflows/lint.yml
scripts/no-now-lint.sh
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: '1.21'
- uses: golangci/golangci-lint-action@v3
- uses: golangci/golangci-lint-action@v4
if: env.GIT_DIFF
with:
# If you change this version, be sure to also change it in contrib/devtools/Makefile.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Buf setup action
uses: bufbuild/buf-setup-action@v1.28.1
uses: bufbuild/buf-setup-action@v1.30.0
- name: Buf push 'third_party/proto'
uses: bufbuild/buf-push-action@v1
with:
Expand All @@ -54,7 +54,7 @@ jobs:
git commit -S -m "Update buf.lock to latest commit hash"
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5.0.2
uses: peter-evans/create-pull-request@v6.0.2
with:
base: main
branch: provenanceio-bot/patch-buf-lock
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.21'
- name: Setup Job
Expand All @@ -40,7 +40,7 @@ jobs:
fi
echo "Setting output: base-branch=$branch"
echo "base-branch=$branch" >> "$GITHUB_OUTPUT"
- uses: bufbuild/buf-setup-action@v1.28.1
- uses: bufbuild/buf-setup-action@v1.30.0
- uses: bufbuild/[email protected]
if: always()
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ needs.build_init.outputs.go_version }}
- name: Build osx binary
Expand All @@ -77,7 +77,7 @@ jobs:
# TODO[1760]: github: Re-enable the build_osx provenanced version step.
if: false
run: build/provenanced version --long
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: osx-zip
path: build/*.zip
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ needs.build_init.outputs.go_version }}
- name: Install deps
Expand All @@ -111,7 +111,7 @@ jobs:
- name: Compile Tests
# TODO[1760]: github: Delete this build_linux Compile Tests step.
run: go test -mod=readonly -timeout 30m -tags='norace ledger test_ledger_mock' -run='ZYX_NOT_A_REAL_TEST_XZY' ./...
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: linux-zip
path: build/provenance*.zip
Expand All @@ -126,7 +126,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Buf setup action
uses: bufbuild/buf-setup-action@v1.28.1
uses: bufbuild/buf-setup-action@v1.30.0
- name: Buf push 'proto/'
uses: bufbuild/buf-push-action@v1
with:
Expand Down Expand Up @@ -168,11 +168,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ needs.build_init.outputs.go_version }}
- name: Download linux zip artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: linux-zip
path: build/
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
uses: actions/checkout@v4

- name: Java Setup
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rosetta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
go.sum
client/rosetta/**
.github/workflows/rosetta.yml
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: ${{ env.GIT_DIFF }}
with:
go-version: '1.21'
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
echo " file-prefix: [${{ needs.setup.outputs.file-prefix }}]"
echo "go-cache-key-suffix: [${{ needs.setup.outputs.go-cache-key-suffix }}]"
echo " go-cache-path: [${{ needs.setup.outputs.go-cache-path }}]"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Load go cache
id: go-cache-setup
with:
Expand All @@ -83,7 +83,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev wget curl build-essential cmake gcc sqlite3
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.setup.outputs.go-version }}
- name: Display go version
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Load go cache
with:
key: ${{ runner.os }}-${{ needs.setup.outputs.go-cache-key-suffix }}
Expand All @@ -122,7 +122,7 @@ jobs:
test_logs="${{ needs.setup.outputs.file-prefix }}-${{ matrix.test }}-${{ matrix.db-backend }}-${{ matrix.os }}"
echo "Setting output: test-logs=$test_logs"
echo "test-logs=$test_logs" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.setup.outputs.go-version }}
- name: Display go version
Expand All @@ -149,7 +149,7 @@ jobs:
fi
fi
exit "$ec"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: ${{ steps.test-logs.outputs.test-logs }}
Expand All @@ -170,7 +170,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Load go cache
with:
key: ${{ runner.os }}-${{ needs.setup.outputs.go-cache-key-suffix }}
Expand All @@ -181,7 +181,7 @@ jobs:
test_logs="${{ needs.setup.outputs.file-prefix }}-${{ matrix.test }}-${{ matrix.db-backend }}-${{ matrix.os }}"
echo "Setting output: test-logs=$test_logs"
echo "test-logs=$test_logs" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.setup.outputs.go-version }}
- name: Display go version
Expand All @@ -194,7 +194,7 @@ jobs:
export DB_BACKEND=${{ matrix.db-backend }}
make test-sim-${{ matrix.test }} | tee "${{ steps.test-logs.outputs.test-logs }}.txt"
exit "${PIPESTATUS[0]}"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: ${{ steps.test-logs.outputs.test-logs }}
Expand All @@ -214,7 +214,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Load go cache
with:
key: ${{ runner.os }}-${{ needs.setup.outputs.go-cache-key-suffix }}
Expand All @@ -225,7 +225,7 @@ jobs:
test_logs="${{ needs.setup.outputs.file-prefix }}-${{ matrix.test }}-${{ matrix.os }}"
echo "Setting output: test-logs=$test_logs"
echo "test-logs=$test_logs" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.setup.outputs.go-version }}
- name: Display go version
Expand All @@ -237,7 +237,7 @@ jobs:
set -x
make test-sim-${{ matrix.test }} | tee "${{ steps.test-logs.outputs.test-logs }}.txt"
exit "${PIPESTATUS[0]}"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: ${{ steps.test-logs.outputs.test-logs }}
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
echo "file-prefix=$file_prefix" >> "$GITHUB_OUTPUT"
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt"
path: ./pkgs.txt
Expand All @@ -52,19 +52,19 @@ jobs:
grep -vF -e 'github.com/provenance-io/provenance/x/marker/simulation' pkgs.txt > pkgs.txt.tmp
split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
printf 'github.com/provenance-io/provenance/x/marker/simulation\n' > pkgs.txt.part.03
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt.part.00"
path: ./pkgs.txt.part.00
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt.part.01"
path: ./pkgs.txt.part.01
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt.part.02"
path: ./pkgs.txt.part.02
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt.part.03"
path: ./pkgs.txt.part.03
Expand All @@ -91,19 +91,19 @@ jobs:
with:
# CodeCov requires fetch-depth > 1
fetch-depth: 2
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: needs.setup-tests.outputs.should-run
with:
go-version: ${{ needs.setup-tests.outputs.go-version }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-pkgs.txt.part.${{ matrix.part }}"
- name: test & coverage report creation
if: needs.setup-tests.outputs.should-run
run: |
cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='norace ledger test_ledger_mock'
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-${{ matrix.part }}-coverage"
Expand All @@ -123,19 +123,19 @@ jobs:
with:
# CodeCov requires fetch-depth > 1
fetch-depth: 2
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-00-coverage"
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-01-coverage"
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-02-coverage"
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-03-coverage"
Expand All @@ -155,7 +155,7 @@ jobs:
echo "Excluding ${filename} from coverage report..."
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
if: needs.setup-tests.outputs.should-run
with:
file: ./coverage.txt
Expand All @@ -175,11 +175,11 @@ jobs:
LD_LIBRARY_PATH: /usr/local/lib:/usr/local/lib/x86_64-linux-gnu
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: needs.setup-tests.outputs.should-run
with:
go-version: ${{ needs.setup-tests.outputs.go-version }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-pkgs.txt.part.${{ matrix.part }}"
Expand All @@ -188,7 +188,7 @@ jobs:
run: |
xargs --arg-file=pkgs.txt.part.${{ matrix.part }} go test -mod=readonly -timeout 30m -race -tags='cgo ledger test_ledger_mock' | tee ${{ matrix.part }}-race-output.txt
exit "${PIPESTATUS[0]}"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: needs.setup-tests.outputs.should-run
with:
name: "${{ needs.setup-tests.outputs.file-prefix }}-${{ matrix.part }}-race-output"
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ linters-settings:
- github.com/stretchr/testify/assert
- github.com/stretchr/testify/suite

- github.com/cometbft/cometbft-db

- github.com/tendermint/tendermint
- github.com/tendermint/tm-db

Expand Down
Loading

0 comments on commit 0bd746c

Please sign in to comment.