Merge branch 'main' into am/13041-deterministic-proto

cosmos · Sep 8, 2022 · 831b94b · 831b94b
2 parents 2e95c03 + 6ec25b6
commit 831b94b
Show file tree

Hide file tree

Showing 109 changed files with 10,896 additions and 173 deletions.
diff --git a/.github/workflows/dependencies-review.yml b/.github/workflows/dependencies-review.yml
@@ -8,7 +8,12 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
       - name: "Checkout Repository"
         uses: actions/checkout@v3
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v2
+      - name: "Dependency audit"
+        run: ./scripts/dep-assert.sh
diff --git a/.github/workflows/fork-cherry-pick.yml b/.github/workflows/fork-cherry-pick.yml
@@ -1,7 +1,9 @@
-#This CI is disabled on main and meant to be enabled on forks as an easy way to cherry pick fork commits into main.
+# This CI is disabled on main and meant to be enabled on forks as an easy way to cherry pick fork commits into main.
+# In order to submit a PR to main, you must add the PR_BOT_PAT secret (personal access token) for the GitHub Action.
+# The PR will be submitted from that user. Note, the PR_BOT_PAT user must have write access to the repo.
 name: Cherry pick PR to Cosmos SDK
 on:
-  #Set to trigger on every merge to main, not just a closed PR.
+  # Set to trigger on every merge to main, not just a closed PR.
   workflow_dispatch:
   pull_request_target:
     branches:
@@ -10,39 +12,28 @@ on:
 
 jobs:
   cherry_pick:
+    permissions: write-all
     runs-on: ubuntu-latest
     name: Cherry pick into main
     if: github.event.pull_request.merged == true
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
+        uses: actions/checkout@v3
       - name: Create PR Patch Branch
         shell: bash
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          PR_NAME: pr-patch-${{ github.sha }}
         run: |
-            git config --global user.name "${GITHUB_ACTOR}" #Configs have to be set for pushing the cherry-picked changes onto fork pr-patch branch.
-            git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-            git remote add upstream https://github.com/cosmos/cosmos-sdk.git
-            git fetch --all                                   # Get the latest code
-            git checkout -b pr-patch upstream/main    # Create new branch based on main branch
-            git cherry-pick ${{github.event.pull_request.head.sha}}  # Cherry pick the latest commit of PR
-            git push -u origin pr-patch-${{github.event.pull_request.head.sha}} # Push your changes to the remote branch
+          git config --global user.name "${{ github.actor }}" # Config have to be set for pushing the cherry-picked changes onto fork pr-patch branch.
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+          git remote add upstream https://github.com/cosmos/cosmos-sdk.git
+          git fetch --all  # Get the latest code
+          git checkout -b $PR_NAME upstream/main    # Create new branch based on main branch
+          git cherry-pick -X theirs ${{ github.sha }} # Cherry pick the latest commit of PR
+          git push -u origin $PR_NAME # Push your changes to the remote branch
       - name: Autocreate PR
         shell: bash
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          GH_TOKEN: ${{ secrets.PR_BOT_PAT }}
         run: |
-          curl --request POST \
-            --url https://api.github.com/repos/cosmos/cosmos-sdk/pulls \
-            --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
-            --header 'content-type: application/json' \
-            --data '{
-              "title": "Automated PR for commit: ${{github.event.pull_request.head.sha}}",
-              "body":"Please merge these awesome changes in!",
-              "head":"${{github.event.pull_request.user.login}}:pr-patch-${{github.event.pull_request.head.sha}}",
-              "base":"main"
-              }' \
-            --fail
+          gh pr create --repo cosmos/cosmos-sdk --base main --head "${{ github.event.repository.owner.login }}:pr-patch-${{ github.sha }}" --title "${{ github.event.pull_request.title }}" --body "Automated PR for commit: ${{ github.sha }} from ${{ github.repository }}"
diff --git a/.github/workflows/proto-docker.yml b/.github/workflows/proto-docker.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@69f6fc9d46f2f8bf0d5491e4aabe0bb8c6a4678a
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           # modify value when deploying a new version

diff --git a/.github/workflows/sims-045.yml b/.github/workflows/sims-045.yml
@@ -10,8 +10,8 @@ on:
 jobs:
   cleanup-runs:
     permissions:
-      actions: write  # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
-      contents: read  # for rokroskar/workflow-run-cleanup-action to obtain branch
+      actions: write # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
+      contents: read # for rokroskar/workflow-run-cleanup-action to obtain branch
     runs-on: buildjet-4vcpu-ubuntu-2004
     steps:
       - uses: rokroskar/workflow-run-cleanup-action@master
@@ -23,6 +23,8 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip-sims')"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: "release/v0.45.x"
       - uses: actions/setup-go@v3
         with:
           go-version: 1.18
@@ -115,9 +117,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ success() }}
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
       - name: Get previous workflow status
         uses: ./.github/actions/last-workflow-status
         id: last_status

diff --git a/.github/workflows/sims-046.yml b/.github/workflows/sims-046.yml
@@ -10,8 +10,8 @@ on:
 jobs:
   cleanup-runs:
     permissions:
-      actions: write  # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
-      contents: read  # for rokroskar/workflow-run-cleanup-action to obtain branch
+      actions: write # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
+      contents: read # for rokroskar/workflow-run-cleanup-action to obtain branch
     runs-on: buildjet-4vcpu-ubuntu-2004
     steps:
       - uses: rokroskar/workflow-run-cleanup-action@master
@@ -23,6 +23,8 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip-sims')"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: "release/v0.46.x"
       - uses: actions/setup-go@v3
         with:
           go-version: 1.18
@@ -115,9 +117,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ success() }}
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
       - name: Get previous workflow status
         uses: ./.github/actions/last-workflow-status
         id: last_status

diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -10,8 +10,8 @@ on:
 jobs:
   cleanup-runs:
     permissions:
-      actions: write  # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
-      contents: read  # for rokroskar/workflow-run-cleanup-action to obtain branch
+      actions: write # for rokroskar/workflow-run-cleanup-action to obtain workflow name & cancel it
+      contents: read # for rokroskar/workflow-run-cleanup-action to obtain branch
     runs-on: buildjet-4vcpu-ubuntu-2004
     steps:
       - uses: rokroskar/workflow-run-cleanup-action@master
@@ -21,8 +21,8 @@ jobs:
 
   build:
     permissions:
-      contents: read  # for actions/checkout to fetch code
-      pull-requests: read  # for technote-space/get-diff-action to get git reference
+      contents: read # for actions/checkout to fetch code
+      pull-requests: read # for technote-space/get-diff-action to get git reference
     runs-on: buildjet-4vcpu-ubuntu-2004
     if: "!contains(github.event.head_commit.message, 'skip-sims')"
     steps:
@@ -114,9 +114,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ success() }}
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
       - name: Get previous workflow status
         uses: ./.github/actions/last-workflow-status
         id: last_status

diff --git a/Makefile b/Makefile
@@ -130,7 +130,7 @@ build-linux:
 	GOOS=linux GOARCH=$(if $(findstring aarch64,$(shell uname -m)) || $(findstring arm64,$(shell uname -m)),arm64,amd64) LEDGER_ENABLED=false $(MAKE) build
 
 $(BUILD_TARGETS): go.sum $(BUILDDIR)/
-	go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
+	cd ${CURRENT_DIR}/simapp && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
 
 $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/
@@ -263,39 +263,39 @@ endif
 
 test-sim-nondeterminism:
 	@echo "Running non-determinism test..."
-	@go test -mod=readonly $(SIMAPP) -run TestAppStateDeterminism -Enabled=true \
+	@cd ${CURRENT_DIR}/simapp && go test -mod=readonly -run TestAppStateDeterminism -Enabled=true \
 		-NumBlocks=100 -BlockSize=200 -Commit=true -Period=0 -v -timeout 24h
 
 test-sim-custom-genesis-fast:
 	@echo "Running custom genesis simulation..."
 	@echo "By default, ${HOME}/.gaiad/config/genesis.json will be used."
-	@go test -mod=readonly $(SIMAPP) -run TestFullAppSimulation -Genesis=${HOME}/.gaiad/config/genesis.json \
+	@cd ${CURRENT_DIR}/simapp && go test -mod=readonly -run TestFullAppSimulation -Genesis=${HOME}/.gaiad/config/genesis.json \
 		-Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=99 -Period=5 -v -timeout 24h
 
 test-sim-import-export: runsim
 	@echo "Running application import/export simulation. This may take several minutes..."
-	@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 50 5 TestAppImportExport
+	@cd ${CURRENT_DIR}/simapp && $(BINDIR)/runsim -Jobs=4 -SimAppPkg=. -ExitOnFail 50 5 TestAppImportExport
 
 test-sim-after-import: runsim
 	@echo "Running application simulation-after-import. This may take several minutes..."
-	@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 50 5 TestAppSimulationAfterImport
+	@cd ${CURRENT_DIR}/simapp && $(BINDIR)/runsim -Jobs=4 -SimAppPkg=. -ExitOnFail 50 5 TestAppSimulationAfterImport
 
 test-sim-custom-genesis-multi-seed: runsim
 	@echo "Running multi-seed custom genesis simulation..."
 	@echo "By default, ${HOME}/.gaiad/config/genesis.json will be used."
-	@$(BINDIR)/runsim -Genesis=${HOME}/.gaiad/config/genesis.json -SimAppPkg=$(SIMAPP) -ExitOnFail 400 5 TestFullAppSimulation
+	@cd ${CURRENT_DIR}/simapp && $(BINDIR)/runsim -Genesis=${HOME}/.gaiad/config/genesis.json -SimAppPkg=. -ExitOnFail 400 5 TestFullAppSimulation
 
 test-sim-multi-seed-long: runsim
 	@echo "Running long multi-seed application simulation. This may take awhile!"
-	@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 500 50 TestFullAppSimulation
+	@cd ${CURRENT_DIR}/simapp && $(BINDIR)/runsim -Jobs=4 -SimAppPkg=. -ExitOnFail 500 50 TestFullAppSimulation
 
 test-sim-multi-seed-short: runsim
 	@echo "Running short multi-seed application simulation. This may take awhile!"
-	@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 50 10 TestFullAppSimulation
+	@cd ${CURRENT_DIR}/simapp && $(BINDIR)/runsim -Jobs=4 -SimAppPkg=. -ExitOnFail 50 10 TestFullAppSimulation
 
 test-sim-benchmark-invariants:
 	@echo "Running simulation invariant benchmarks..."
-	@go test -mod=readonly $(SIMAPP) -benchmem -bench=BenchmarkInvariants -run=^$ \
+	cd ${CURRENT_DIR}/simapp && @go test -mod=readonly -benchmem -bench=BenchmarkInvariants -run=^$ \
 	-Enabled=true -NumBlocks=1000 -BlockSize=200 \
 	-Period=1 -Commit=true -Seed=57 -v -timeout 24h