Merge branch 'scirner22/build-heighliner-image' of github.com:provena…

…nce-io/provenance into scirner22/build-heighliner-image
provenance-io · May 17, 2024 · 9b8ea32 · 9b8ea32
2 parents 37f32d4 + 2ee28f3
commit 9b8ea32
Show file tree

Hide file tree

Showing 44 changed files with 8,672 additions and 5,307 deletions.
diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.31.0
+        uses: bufbuild/buf-setup-action@v1.32.0
       - name: Buf push 'third_party/proto'
         uses: bufbuild/buf-push-action@v1
         with:

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -40,7 +40,7 @@ jobs:
           fi
           echo "Setting output: base-branch=$branch"
           echo "base-branch=$branch" >> "$GITHUB_OUTPUT"
-      - uses: bufbuild/buf-setup-action@v1.31.0
+      - uses: bufbuild/buf-setup-action@v1.32.0
       - uses: bufbuild/[email protected]
         if: always()
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -119,7 +119,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.31.0
+        uses: bufbuild/buf-setup-action@v1.32.0
       - name: Buf push 'proto/'
         uses: bufbuild/buf-push-action@v1
         with:

diff --git a/.github/workflows/rosetta.yml b/.github/workflows/rosetta.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,13 +52,11 @@ jobs:
         # TODO[1760]: Re-analyze how long tests tests take and change the splitting back to be based on speed.
         run: |
           grep -vF \
-            -e 'github.com/provenance-io/provenance/x/ibchooks' \
             -e 'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
             -e 'github.com/provenance-io/provenance/x/oracle/simulation' \
             pkgs.txt > pkgs.txt.tmp
           split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
           printf '%s\n' \
-            'github.com/provenance-io/provenance/x/ibchooks' \
             'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
             'github.com/provenance-io/provenance/x/oracle/simulation' \
             > pkgs.txt.part.03

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
   *  IbcHooks module param migration [#1939](https://github.com/provenance-io/provenance/pull/1939).
   *  Bank module param migration [#1967](https://github.com/provenance-io/provenance/pull/1967).
 * Remove `msgfees` legacy gov proposals [#1953](https://github.com/provenance-io/provenance/pull/1953).
+* Remove `marker` legacy gov proposals [#1961](https://github.com/provenance-io/provenance/pull/1961).
 * Restore the hold module [#1930](https://github.com/provenance-io/provenance/pull/1930).
 * Restore gov-prop cli commands and fix next key decoding [#1930](https://github.com/provenance-io/provenance/pull/1930).
 * Switch to InputOutputCoinsProv for exchange transfers [#1930](https://github.com/provenance-io/provenance/pull/1930).
@@ -86,12 +87,15 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * Clean up the marker module's expected BankKeeper interface [#1954](https://github.com/provenance-io/provenance/pull/1954).
 * Add the auto-cli commands and a few others newly added by the SDK [#1971](https://github.com/provenance-io/provenance/pull/1971).
 * Fix unit tests for ibcratelimit [#1977](https://github.com/provenance-io/provenance/pull/1977).
+* Fix unit tests for ibchooks [#1980](https://github.com/provenance-io/provenance/pull/1980).
 
 ### Client Breaking
 
 * The `provenanced query account` command has been removed. It is still available as `provenanced query auth account` [#1971](https://github.com/provenance-io/provenance/pull/1971).
 * Move the genesis-related commands into a new `genesis` sub-command, and remove the `genesis-` parts of their names [#1971](https://github.com/provenance-io/provenance/pull/1971).
 * Many of the SDK's query commands have had their usage altered [#1971](https://github.com/provenance-io/provenance/pull/1971).
+* Rosetta has been removed from the `provenanced` executable [#1981](https://github.com/provenance-io/provenance/pull/1981).
+  It is now a stand-alone service. See: <https://github.com/cosmos/rosetta> for more info.
 
 ### Deprecated
 
@@ -103,7 +107,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - Bump `google.golang.org/grpc` from 1.62.1 to 1.64.0 ([#1903](https://github.com/provenance-io/provenance/pull/1903), [#1918](https://github.com/provenance-io/provenance/pull/1918), [#1972](https://github.com/provenance-io/provenance/pull/1972))
 - Bump `bufbuild/buf-breaking-action` from 1.1.3 to 1.1.4 ([#1894](https://github.com/provenance-io/provenance/pull/1894))
 - Bump `bufbuild/buf-lint-action` from 1.1.0 to 1.1.1 ([#1895](https://github.com/provenance-io/provenance/pull/1895))
-- Bump `bufbuild/buf-setup-action` from 1.30.0 to 1.31.0 ([#1904](https://github.com/provenance-io/provenance/pull/1904), [#1949](https://github.com/provenance-io/provenance/pull/1949))
+- Bump `bufbuild/buf-setup-action` from 1.30.0 to 1.32.0 ([#1904](https://github.com/provenance-io/provenance/pull/1904), [#1949](https://github.com/provenance-io/provenance/pull/1949), [#1979](https://github.com/provenance-io/provenance/pull/1979))
 - Bump `github.com/cometbft/cometbft` from 0.38.5 to 0.38.7 ([#1912](https://github.com/provenance-io/provenance/pull/1912), [#1959](https://github.com/provenance-io/provenance/pull/1959))
 - Bump `cosmossdk.io/x/upgrade` from 0.1.0 to 0.1.1 ([#1913](https://github.com/provenance-io/provenance/pull/1913))
 - Bump `github.com/hashicorp/go-metrics` from 0.5.2 to 0.5.3 ([#1914](https://github.com/provenance-io/provenance/pull/1914))

diff --git a/Makefile b/Makefile
@@ -537,11 +537,6 @@ update-swagger-docs: statik proto-swagger-gen
 
 .PHONY: update-swagger-docs
 
-test-rosetta:
-	docker build -t rosetta-ci:latest -f client/rosetta/rosetta-ci/Dockerfile .
-	docker-compose -f client/rosetta/docker-compose.yaml --project-directory ./ up --abort-on-container-exit --exit-code-from test_rosetta --build
-.PHONY: test-rosetta
-
 ##############################
 ### Relayer
 ##############################

diff --git a/app/app.go b/app/app.go
@@ -692,8 +692,7 @@ func New(
 	// register the proposal types
 	govRouter := govtypesv1beta1.NewRouter()
 	govRouter.AddRoute(govtypes.RouterKey, govtypesv1beta1.ProposalHandler).
-		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
-		AddRoute(markertypes.ModuleName, marker.NewProposalHandler(app.MarkerKeeper))
+		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper))
 	govKeeper := govkeeper.NewKeeper(
 		appCodec, runtime.NewKVStoreService(keys[govtypes.StoreKey]), app.AccountKeeper, app.BankKeeper,
 		app.StakingKeeper, app.DistrKeeper, app.BaseApp.MsgServiceRouter(), govtypes.Config{MaxMetadataLen: 10000}, govAuthority,

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -106856,6 +106856,11 @@ definitions:
   provenance.marker.v1.MsgCancelResponse:
     type: object
     title: MsgCancelResponse defines the Msg/Cancel response type
+  provenance.marker.v1.MsgChangeStatusProposalResponse:
+    type: object
+    title: >-
+      MsgChangeStatusProposalResponse defines the Msg/ChangeStatusProposal
+      response type
   provenance.marker.v1.MsgDeleteAccessResponse:
     type: object
     title: MsgDeleteAccessResponse defines the Msg/DeleteAccess response type
@@ -106876,12 +106881,32 @@ definitions:
   provenance.marker.v1.MsgMintResponse:
     type: object
     title: MsgMintResponse defines the Msg/Mint response type
+  provenance.marker.v1.MsgRemoveAdministratorProposalResponse:
+    type: object
+    title: >-
+      MsgRemoveAdministratorProposalResponse defines the
+      Msg/RemoveAdministratorProposal response type
   provenance.marker.v1.MsgSetAccountDataResponse:
     type: object
     title: MsgSetAccountDataResponse defines the Msg/SetAccountData response type
+  provenance.marker.v1.MsgSetAdministratorProposalResponse:
+    type: object
+    title: >-
+      MsgSetAdministratorProposalResponse defines the
+      Msg/SetAdministratorProposal response type
+  provenance.marker.v1.MsgSetDenomMetadataProposalResponse:
+    type: object
+    title: >-
+      MsgSetDenomMetadataProposalResponse defines the
+      Msg/SetDenomMetadataProposal response type
   provenance.marker.v1.MsgSetDenomMetadataResponse:
     type: object
     title: MsgSetDenomMetadataResponse defines the Msg/SetDenomMetadata response type
+  provenance.marker.v1.MsgSupplyDecreaseProposalResponse:
+    type: object
+    title: >-
+      MsgSupplyIncreaseProposalResponse defines the Msg/SupplyDecreaseProposal
+      response type
   provenance.marker.v1.MsgSupplyIncreaseProposalResponse:
     type: object
     title: >-
@@ -106905,6 +106930,11 @@ definitions:
     title: >-
       MsgUpdateSendDenyListResponse defines the Msg/UpdateSendDenyList response
       type
+  provenance.marker.v1.MsgWithdrawEscrowProposalResponse:
+    type: object
+    title: >-
+      MsgWithdrawEscrowProposalResponse defines the Msg/WithdrawEscrowProposal
+      response type
   provenance.marker.v1.MsgWithdrawResponse:
     type: object
     title: MsgWithdrawResponse defines the Msg/Withdraw response type

diff --git a/client/rosetta/README.md b/client/rosetta/README.md
diff --git a/client/rosetta/configuration/bootstrap.json b/client/rosetta/configuration/bootstrap.json
diff --git a/client/rosetta/configuration/faucet.py b/client/rosetta/configuration/faucet.py
diff --git a/client/rosetta/configuration/rosetta.json b/client/rosetta/configuration/rosetta.json
diff --git a/client/rosetta/configuration/run_tests.sh b/client/rosetta/configuration/run_tests.sh
diff --git a/client/rosetta/configuration/send_funds.sh b/client/rosetta/configuration/send_funds.sh