add governance address for message

zeta-chain · Feb 29, 2024 · 4d7b101 · 4d7b101
1 parent d4d0510
commit 4d7b101
Show file tree

Hide file tree

Showing 16 changed files with 88 additions and 46 deletions.
diff --git a/app/app.go b/app/app.go
@@ -361,6 +361,7 @@ func New(
 		appCodec,
 		keys[authoritytypes.StoreKey],
 		keys[authoritytypes.MemStoreKey],
+		authtypes.NewModuleAddress(govtypes.ModuleName),
 	)
 
 	app.ObserverKeeper = observerkeeper.NewKeeper(

diff --git a/docs/spec/authority/messages.md b/docs/spec/authority/messages.md
@@ -6,7 +6,7 @@ UpdatePolicies updates policies
 
 ```proto
 message MsgUpdatePolicies {
-	string authority_address = 1;
+	string signer = 1;
 	Policies policies = 2;
 }
 ```

diff --git a/docs/spec/crosschain/messages.md b/docs/spec/crosschain/messages.md
@@ -215,7 +215,7 @@ message MsgWhitelistERC20 {
 
 ## MsgUpdateTssAddress
 
-Authorized: admin policy group 2.
+UpdateTssAddress updates the TSS address.
 
 ```proto
 message MsgUpdateTssAddress {
@@ -226,7 +226,7 @@ message MsgUpdateTssAddress {
 
 ## MsgMigrateTssFunds
 
-Authorized: admin policy group 2.
+MigrateTssFunds migrates the funds from the current TSS to the new TSS
 
 ```proto
 message MsgMigrateTssFunds {

diff --git a/docs/spec/fungible/messages.md b/docs/spec/fungible/messages.md
@@ -91,7 +91,7 @@ message MsgUpdateContractBytecode {
 
 ## MsgUpdateZRC20WithdrawFee
 
-Authorized: admin policy group 2.
+UpdateZRC20WithdrawFee updates the withdraw fee and gas limit of a zrc20 token
 
 ```proto
 message MsgUpdateZRC20WithdrawFee {

diff --git a/proto/authority/tx.proto b/proto/authority/tx.proto
@@ -13,7 +13,7 @@ service Msg {
 
 // MsgUpdatePolicies defines the MsgUpdatePolicies service.
 message MsgUpdatePolicies {
-  string authority_address = 1;
+  string signer = 1;
   Policies policies = 2 [(gogoproto.nullable) = false];
 }
 

diff --git a/testutil/keeper/authority.go b/testutil/keeper/authority.go
@@ -7,13 +7,18 @@ import (
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	mock "github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	tmdb "github.com/tendermint/tm-db"
+	"github.com/zeta-chain/zetacore/testutil/sample"
 	"github.com/zeta-chain/zetacore/x/authority/keeper"
 	"github.com/zeta-chain/zetacore/x/authority/types"
 )
 
+var (
+	AuthorityGovAddress = sample.Bech32AccAddress()
+)
+
 func initAuthorityKeeper(
 	cdc codec.Codec,
 	db *tmdb.MemDB,
@@ -28,6 +33,7 @@ func initAuthorityKeeper(
 		cdc,
 		storeKey,
 		memKey,
+		AuthorityGovAddress,
 	)
 }
 
@@ -61,6 +67,7 @@ func AuthorityKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 		cdc,
 		storeKey,
 		memStoreKey,
+		AuthorityGovAddress,
 	)
 
 	return &k, ctx

diff --git a/typescript/authority/tx_pb.d.ts b/typescript/authority/tx_pb.d.ts
@@ -14,9 +14,9 @@ import type { Policies } from "./policies_pb.js";
  */
 export declare class MsgUpdatePolicies extends Message<MsgUpdatePolicies> {
   /**
-   * @generated from field: string authority_address = 1;
+   * @generated from field: string signer = 1;
    */
-  authorityAddress: string;
+  signer: string;
 
   /**
    * @generated from field: zetachain.zetacore.authority.Policies policies = 2;

diff --git a/x/authority/keeper/keeper.go b/x/authority/keeper/keeper.go
@@ -15,18 +15,22 @@ type Keeper struct {
 	cdc      codec.Codec
 	storeKey storetypes.StoreKey
 	memKey   storetypes.StoreKey
+	// the address capable of executing a MsgUpdatePolicies message. Typically, this should be the x/gov module account.
+	govAddr sdk.AccAddress
 }
 
 // NewKeeper creates new instances of the authority Keeper
 func NewKeeper(
 	cdc codec.Codec,
 	storeKey,
 	memKey storetypes.StoreKey,
+	govAddr sdk.AccAddress,
 ) Keeper {
 	return Keeper{
 		cdc:      cdc,
 		storeKey: storeKey,
 		memKey:   memKey,
+		govAddr:  govAddr,
 	}
 }
 

diff --git a/x/authority/keeper/msg_server_update_policies.go b/x/authority/keeper/msg_server_update_policies.go
@@ -3,16 +3,27 @@ package keeper
 import (
 	"context"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/zeta-chain/zetacore/x/authority/types"
 )
 
 // UpdatePolicies updates policies
 func (k msgServer) UpdatePolicies(goCtx context.Context, msg *types.MsgUpdatePolicies) (*types.MsgUpdatePoliciesResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	// TODO: check if authorized
+	// check called by governance
+	if k.govAddr.String() != msg.Signer {
+		return nil, errorsmod.Wrapf(
+			govtypes.ErrInvalidSigner,
+			"invalid authority, expected %s, got %s",
+			k.govAddr.String(),
+			msg.Signer,
+		)
+	}
 
+	// set policies
 	k.SetPolicies(ctx, msg.Policies)
 
 	return &types.MsgUpdatePoliciesResponse{}, nil

diff --git a/x/authority/keeper/msg_server_update_policies_test.go b/x/authority/keeper/msg_server_update_policies_test.go
@@ -3,6 +3,8 @@ package keeper_test
 import (
 	"testing"
 
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
@@ -12,15 +14,28 @@ import (
 )
 
 func TestMsgServer_UpdatePolicies(t *testing.T) {
+	t.Run("can't update policies with invalid signer", func(t *testing.T) {
+		k, ctx := keepertest.AuthorityKeeper(t)
+		msgServer := keeper.NewMsgServerImpl(*k)
+
+		policies := sample.Policies()
+
+		_, err := msgServer.UpdatePolicies(sdk.WrapSDKContext(ctx), &types.MsgUpdatePolicies{
+			Signer:   sample.AccAddress(),
+			Policies: policies,
+		})
+		require.ErrorIs(t, err, govtypes.ErrInvalidSigner)
+	})
+
 	t.Run("can update policies", func(t *testing.T) {
 		k, ctx := keepertest.AuthorityKeeper(t)
 		msgServer := keeper.NewMsgServerImpl(*k)
 
 		policies := sample.Policies()
 
 		res, err := msgServer.UpdatePolicies(sdk.WrapSDKContext(ctx), &types.MsgUpdatePolicies{
-			AuthorityAddress: sample.AccAddress(),
-			Policies:         policies,
+			Signer:   keepertest.AuthorityGovAddress.String(),
+			Policies: policies,
 		})
 		require.NotNil(t, res)
 		require.NoError(t, err)

diff --git a/x/authority/types/message_update_policies.go b/x/authority/types/message_update_policies.go
@@ -10,10 +10,10 @@ const TypeMsgUpdatePolicies = "UpdatePolicies"
 
 var _ sdk.Msg = &MsgUpdatePolicies{}
 
-func NewMsgUpdatePolicies(creator string, policies Policies) *MsgUpdatePolicies {
+func NewMsgUpdatePolicies(signer string, policies Policies) *MsgUpdatePolicies {
 	return &MsgUpdatePolicies{
-		AuthorityAddress: creator,
-		Policies:         policies,
+		Signer:   signer,
+		Policies: policies,
 	}
 }
 
@@ -26,7 +26,7 @@ func (msg *MsgUpdatePolicies) Type() string {
 }
 
 func (msg *MsgUpdatePolicies) GetSigners() []sdk.AccAddress {
-	creator, err := sdk.AccAddressFromBech32(msg.AuthorityAddress)
+	creator, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		panic(err)
 	}
@@ -39,9 +39,9 @@ func (msg *MsgUpdatePolicies) GetSignBytes() []byte {
 }
 
 func (msg *MsgUpdatePolicies) ValidateBasic() error {
-	_, err := sdk.AccAddressFromBech32(msg.AuthorityAddress)
+	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
-		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid signer address (%s)", err)
 	}
 
 	if err := msg.Policies.Validate(); err != nil {

diff --git a/x/authority/types/tx.pb.go b/x/authority/types/tx.pb.go
diff --git a/x/crosschain/keeper/gas_payment_test.go b/x/crosschain/keeper/gas_payment_test.go
@@ -1,11 +1,12 @@
 package keeper_test
 
 import (
-	"github.com/zeta-chain/zetacore/testutil/sample"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"math/big"
 	"testing"
 
+	"github.com/zeta-chain/zetacore/testutil/sample"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
+
 	"cosmossdk.io/math"
 
 	"github.com/stretchr/testify/require"

diff --git a/x/crosschain/keeper/msg_server_update_tss.go b/x/crosschain/keeper/msg_server_update_tss.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 
 	errorsmod "cosmossdk.io/errors"

diff --git a/x/crosschain/keeper/msg_server_whitelist_erc20.go b/x/crosschain/keeper/msg_server_whitelist_erc20.go
@@ -3,9 +3,10 @@ package keeper
 import (
 	"context"
 	"fmt"
-	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 	"math/big"
 
+	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
+
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 

diff --git a/x/crosschain/keeper/msg_server_whitelist_erc20_test.go b/x/crosschain/keeper/msg_server_whitelist_erc20_test.go
@@ -2,9 +2,10 @@ package keeper_test
 
 import (
 	"fmt"
-	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 	"testing"
 
+	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
+
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"