Backport scope/attributes, gov deposit, and java distribution changes

.github/workflows/build-and-publish-proto-bindings.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Java Setup
         uses: actions/setup-java@v2.5.0
         with:
+          distribution: 'zulu'
           java-version: 11
           server-id: github
 

CHANGELOG.md

@@ -46,6 +46,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * Upgrade provenance to 0.45 cosmos sdk release [#607](https://github.com/provenance-io/provenance/issues/607)
 * Upgrade wasmd to v0.22.0 Note: this removes dependency on provenance-io's wasmd fork [#479](https://github.com/provenance-io/provenance/issues/479)
 * Add support for Scope mutation via wasm Smart Contracts [#531](https://github.com/provenance-io/provenance/issues/531)
+* Increase governance deposit amount and add create proposal msg fee [#632](https://github.com/provenance-io/provenance/issues/632)
+* Allow attributes to be associated with scopes [#631](https://github.com/provenance-io/provenance/issues/631)
 
 ### Improvements
 
@@ -72,6 +74,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * Allow manager to adjust grants on finalized markers [#545](https://github.com/provenance-io/provenance/issues/545)
 * Add migration to re-index the metadata indexes involving addresses [#541](https://github.com/provenance-io/provenance/issues/541)
 * Add migration to delete empty sessions [#480](https://github.com/provenance-io/provenance/issues/480)
+* Add Java distribution tag to workflow [#624](https://github.com/provenance-io/provenance/issues/624)
 
 ## [v1.7.6](https://github.com/provenance-io/provenance/releases/tag/v1.7.6) - 2021-12-15
 

app/upgrades.go

@@ -7,6 +7,7 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/cosmos/ibc-go/v2/modules/core/exported"
 	ibcctmtypes "github.com/cosmos/ibc-go/v2/modules/light-clients/07-tendermint/types"
@@ -47,6 +48,13 @@ var handlers = map[string]appUpgrade{
 				return false
 			})
 
+			// set governance deposit requirement to 50,000HASH
+			govParams := app.GovKeeper.GetDepositParams(ctx)
+			beforeDeposit := govParams.MinDeposit
+			govParams.MinDeposit = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(50_000_000_000_000)))
+			app.GovKeeper.SetDepositParams(ctx, govParams)
+			ctx.Logger().Info(fmt.Sprintf("Updated governance module minimum deposit from %s to %s", beforeDeposit, govParams.MinDeposit))
+
 			// set attribute param length to 1,000 from 10,000
 			attrParams := app.AttributeKeeper.GetParams(ctx)
 			beforeLength := attrParams.MaxValueLength
@@ -73,27 +81,30 @@ var handlers = map[string]appUpgrade{
 
 // AddMsgBasedFees adds pio specific msg based fees for BindName, AddMarker, AddAttribute, WriteScope, P8EMemorializeContract requests for v1.8.0 upgrade
 func AddMsgBasedFees(app *App, ctx sdk.Context) error {
-	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgBindNameRequest (1/5)")
+	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgBindNameRequest (1/6)")
 	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&nametypes.MsgBindNameRequest{}), sdk.NewCoin("nhash", sdk.NewInt(10_000_000_000)))); err != nil {
 		return err
 	}
-	ctx.Logger().Info("Adding a 100 hash (100,000,000,000 nhash) msg fee to MsgAddMarkerRequest (2/5)")
+	ctx.Logger().Info("Adding a 100 hash (100,000,000,000 nhash) msg fee to MsgAddMarkerRequest (2/6)")
 	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&markertypes.MsgAddMarkerRequest{}), sdk.NewCoin("nhash", sdk.NewInt(100_000_000_000)))); err != nil {
 		return err
 	}
-	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgAddAttributeRequest (3/5)")
+	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgAddAttributeRequest (3/6)")
 	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&attributetypes.MsgAddAttributeRequest{}), sdk.NewCoin("nhash", sdk.NewInt(10_000_000_000)))); err != nil {
 		return err
 	}
-	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgWriteScopeRequest (4/5)")
+	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgWriteScopeRequest (4/6)")
 	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&metadatatypes.MsgWriteScopeRequest{}), sdk.NewCoin("nhash", sdk.NewInt(10_000_000_000)))); err != nil {
 		return err
 	}
-	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgP8EMemorializeContractRequest (5/5)")
+	ctx.Logger().Info("Adding a 10 hash (10,000,000,000 nhash) msg fee to MsgP8EMemorializeContractRequest (5/6)")
 	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&metadatatypes.MsgP8EMemorializeContractRequest{}), sdk.NewCoin("nhash", sdk.NewInt(10_000_000_000)))); err != nil {
 		return err
 	}
-
+	ctx.Logger().Info("Adding a 100 hash (100,000,000,000 nhash) msg fee to MsgSubmitProposal (6/6)")
+	if err := app.MsgFeesKeeper.SetMsgFee(ctx, msgfeestypes.NewMsgFee(sdk.MsgTypeURL(&govtypes.MsgSubmitProposal{}), sdk.NewCoin("nhash", sdk.NewInt(100_000_000_000)))); err != nil {
+		return err
+	}
 	return nil
 }
 

cmd/provenanced/cmd/root_test.go

@@ -9,5 +9,5 @@ import (
 )
 
 func TestIAVLConfig(t *testing.T) {
-	require.Equal(t,getIAVLCacheSize(app.EmptyAppOptions{}),cast.ToInt(serverconfig.DefaultConfig().IAVLCacheSize))
+	require.Equal(t, getIAVLCacheSize(app.EmptyAppOptions{}), cast.ToInt(serverconfig.DefaultConfig().IAVLCacheSize))
 }

internal/antewrapper/msg_fees_decorator_test.go

@@ -12,8 +12,6 @@ import (
 	"github.com/provenance-io/provenance/internal/antewrapper"
 )
 
-
-
 // checkTx true, high min gas price(high enough so that additional fee in same denom tips it over,
 //and this is what sets it apart from MempoolDecorator which has already been run)
 func (suite *AnteTestSuite) TestEnsureMempoolAndMsgFees() {
@@ -363,4 +361,3 @@ func setUpApp(suite *AnteTestSuite, checkTx bool, additionalFeeCoinDenom string,
 	antehandler := sdk.ChainAnteDecorators(mfd)
 	return err, antehandler
 }
-

internal/antewrapper/testutil_test.go

@@ -213,11 +213,10 @@ func (suite *AnteTestSuite) CreateMsgFee(fee sdk.Coin, msgs ...sdk.Msg) error {
 
 // NewTestGasLimit is a test fee gas limit.
 // they keep changing this value and our tests break, hence moving it to test.
-func (suite *AnteTestSuite)NewTestGasLimit() uint64 {
+func (suite *AnteTestSuite) NewTestGasLimit() uint64 {
 	return 100000
 }
 
-
 func TestAnteTestSuite(t *testing.T) {
 	suite.Run(t, new(AnteTestSuite))
 }

x/attribute/client/cli/cli_test.go

@@ -135,26 +135,26 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	attributeData.Attributes = append(attributeData.Attributes,
 		attributetypes.NewAttribute(
 			"example.attribute",
-			s.account1Addr,
+			s.account1Str,
 			attributetypes.AttributeType_String,
 			[]byte("example attribute value string")))
 	attributeData.Attributes = append(attributeData.Attributes,
 		attributetypes.NewAttribute(
 			"example.attribute.count",
-			s.account1Addr,
+			s.account1Str,
 			attributetypes.AttributeType_Int,
 			[]byte("2")))
 	for i := 0; i < s.accAttrCount; i++ {
 		attributeData.Attributes = append(attributeData.Attributes,
 			attributetypes.NewAttribute(
 				fmt.Sprintf("example.attribute.%s", toWritten(i)),
-				s.account3Addr,
+				s.account3Str,
 				attributetypes.AttributeType_Int,
 				[]byte(fmt.Sprintf("%d", i))))
 		attributeData.Attributes = append(attributeData.Attributes,
 			attributetypes.NewAttribute(
 				"example.attribute.overload",
-				s.account4Addr,
+				s.account4Str,
 				attributetypes.AttributeType_String,
 				[]byte(toWritten(i))))
 	}

x/attribute/client/cli/tx.go

@@ -12,8 +12,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/provenance-io/provenance/x/attribute/types"
 )
 
@@ -53,9 +51,11 @@ Refer to %s tx name bind --help for more information on how to do this.`, versio
 			}
 
 			name := args[0]
-			account, err := sdk.AccAddressFromBech32(args[1])
+			account := args[1]
+
+			err = types.ValidateAttributeAddress(account)
 			if err != nil {
-				return fmt.Errorf("account address must be a Bech32 string: %w", err)
+				return fmt.Errorf("invalid address: %w", err)
 			}
 			attributeType, err := types.AttributeTypeFromString(strings.TrimSpace(args[2]))
 			if err != nil {
@@ -98,9 +98,11 @@ func NewUpdateAccountAttributeCmd() *cobra.Command {
 			}
 
 			name := args[0]
-			account, err := sdk.AccAddressFromBech32(args[1])
+			account := args[1]
+
+			err = types.ValidateAttributeAddress(account)
 			if err != nil {
-				return fmt.Errorf("account address must be a Bech32 string: %w", err)
+				return fmt.Errorf("invalid account address: %w", err)
 			}
 			origAttributeType, err := types.AttributeTypeFromString(strings.TrimSpace(args[2]))
 			if err != nil {
@@ -166,9 +168,9 @@ func NewDeleteDistinctAccountAttributeCmd() *cobra.Command {
 				return err
 			}
 
-			account, err := sdk.AccAddressFromBech32(args[1])
+			err = types.ValidateAttributeAddress(args[1])
 			if err != nil {
-				return fmt.Errorf("account address must be a Bech32 string: %w", err)
+				return fmt.Errorf("invalid attribute address: %w", err)
 			}
 			attributeType, err := types.AttributeTypeFromString(strings.TrimSpace(args[2]))
 			if err != nil {
@@ -178,7 +180,7 @@ func NewDeleteDistinctAccountAttributeCmd() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("error encoding value %s to type %s : %v", deleteValue, attributeType.String(), err)
 			}
-			msg := types.NewMsgDeleteDistinctAttributeRequest(account, clientCtx.GetFromAddress(), args[0], deleteValue)
+			msg := types.NewMsgDeleteDistinctAttributeRequest(args[1], clientCtx.GetFromAddress(), args[0], deleteValue)
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
@@ -202,12 +204,12 @@ func NewDeleteAccountAttributeCmd() *cobra.Command {
 				return err
 			}
 
-			account, err := sdk.AccAddressFromBech32(args[1])
+			err = types.ValidateAttributeAddress(args[1])
 			if err != nil {
-				return fmt.Errorf("account address must be a Bech32 string: %w", err)
+				return fmt.Errorf("invalid address: %w", err)
 			}
 			msg := types.NewMsgDeleteAttributeRequest(
-				account,
+				args[1],
 				clientCtx.GetFromAddress(),
 				args[0],
 			)

x/attribute/client/rest/grpc_query_test.go

@@ -32,6 +32,7 @@ type IntegrationTestSuite struct {
 
 	accountAddr sdk.AccAddress
 	accountKey  *secp256r1.PrivKey
+	accountStr  string
 }
 
 func (s *IntegrationTestSuite) SetupSuite() {
@@ -40,6 +41,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	addr, err := sdk.AccAddressFromHex(s.accountKey.PubKey().Address().String())
 	s.Require().NoError(err)
 	s.accountAddr = addr
+	s.accountStr = s.accountAddr.String()
 	s.T().Log("setting up integration test suite")
 
 	cfg := testutil.DefaultTestNetworkConfig()
@@ -74,7 +76,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	accountData.Attributes = append(accountData.Attributes,
 		attributetypes.NewAttribute(
 			"example.attribute",
-			s.accountAddr,
+			s.accountStr,
 			attributetypes.AttributeType_String,
 			[]byte("example attribute value string")))
 	accountData.Params.MaxValueLength = 32
@@ -131,7 +133,7 @@ func (s *IntegrationTestSuite) TestGRPCQueries() {
 				Account: s.accountAddr.String(),
 				Attributes: []attributetypes.Attribute{
 					attributetypes.NewAttribute("example.attribute",
-						s.accountAddr,
+						s.accountStr,
 						attributetypes.AttributeType_String,
 						[]byte("example attribute value string")),
 				},
@@ -148,7 +150,7 @@ func (s *IntegrationTestSuite) TestGRPCQueries() {
 				Account: s.accountAddr.String(),
 				Attributes: []attributetypes.Attribute{
 					attributetypes.NewAttribute("example.attribute",
-						s.accountAddr,
+						s.accountStr,
 						attributetypes.AttributeType_String,
 						[]byte("example attribute value string")),
 				},
@@ -177,7 +179,7 @@ func (s *IntegrationTestSuite) TestGRPCQueries() {
 				Account: s.accountAddr.String(),
 				Attributes: []attributetypes.Attribute{
 					attributetypes.NewAttribute("example.attribute",
-						s.accountAddr,
+						s.accountStr,
 						attributetypes.AttributeType_String,
 						[]byte("example attribute value string")),
 				},

x/attribute/client/rest/tx.go

@@ -49,11 +49,6 @@ func NewAddAttributeRequestHandlerFn(clientCtx client.Context) http.HandlerFunc
 		if !req.BaseReq.ValidateBasic(w) {
 			return
 		}
-		account, err := sdk.AccAddressFromBech32(req.Account)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
-			return
-		}
 		owner, err := sdk.AccAddressFromBech32(req.BaseReq.From)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
@@ -70,7 +65,7 @@ func NewAddAttributeRequestHandlerFn(clientCtx client.Context) http.HandlerFunc
 			return
 		}
 		msg := types.NewMsgAddAttributeRequest(
-			account,
+			req.Account,
 			owner, // name must resolve to this address
 			req.Name,
 			at,
@@ -103,18 +98,13 @@ func NewDeleteAttributeHandlerFn(clientCtx client.Context) http.HandlerFunc {
 		if !req.BaseReq.ValidateBasic(w) {
 			return
 		}
-		account, err := sdk.AccAddressFromBech32(req.Account)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
-			return
-		}
 		owner, err := sdk.AccAddressFromBech32(req.BaseReq.From)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return
 		}
 		msg := types.NewMsgDeleteAttributeRequest(
-			account,
+			req.Account,
 			owner, // name must resolve to this address
 			req.Name,
 		)

x/attribute/handler_test.go

@@ -100,7 +100,7 @@ func (s HandlerTestSuite) TestMsgAddAttributeRequest() {
 	cases := []CommonTest{
 		{
 			"should successfully add new attribute",
-			types.NewMsgAddAttributeRequest(s.user1Addr,
+			types.NewMsgAddAttributeRequest(s.user1,
 				s.user1Addr, "example.name", types.AttributeType_String, []byte("value")),
 			[]string{s.user1},
 			"",
@@ -133,7 +133,7 @@ func (s HandlerTestSuite) TestMsgUpdateAttributeRequest() {
 		{
 			"should successfully update attribute",
 			types.NewMsgUpdateAttributeRequest(
-				s.user1Addr,
+				s.user1,
 				s.user1Addr, "example.name",
 				[]byte("value"), []byte("1"),
 				types.AttributeType_String,
@@ -169,7 +169,7 @@ func (s HandlerTestSuite) TestMsgDistinctDeleteAttributeRequest() {
 	cases := []CommonTest{
 		{
 			"should successfully delete attribute with value",
-			types.NewMsgDeleteDistinctAttributeRequest(s.user1Addr, s.user1Addr, "example.name", []byte("value")),
+			types.NewMsgDeleteDistinctAttributeRequest(s.user1, s.user1Addr, "example.name", []byte("value")),
 			[]string{s.user1},
 			"",
 			types.NewEventDistinctAttributeDelete("example.name", string([]byte("value")), s.user1, s.user1),
@@ -193,7 +193,7 @@ func (s HandlerTestSuite) TestMsgDeleteAttributeRequest() {
 	cases := []CommonTest{
 		{
 			"should successfully add new attribute",
-			types.NewMsgDeleteAttributeRequest(s.user1Addr, s.user1Addr, "example.name"),
+			types.NewMsgDeleteAttributeRequest(s.user1, s.user1Addr, "example.name"),
 			[]string{s.user1},
 			"",
 			types.NewEventAttributeDelete("example.name", s.user1, s.user1),