Remove RunAs from Migrate proposal

CosmWasm · Jan 24, 2022 · 0a96e26 · 0a96e26
1 parent 82f023c
commit 0a96e26
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 129 deletions.
diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
@@ -673,7 +673,7 @@ contract.
 | `description` | [string](#string) | | Description is a human readable text |
 | `run_as` | [string](#string) | | RunAs is the address that is passed to the contract's environment as sender |
 | `contract` | [string](#string) | | Contract is the address of the smart contract |
-| `msg` | [bytes](#bytes) | | Msg json encoded message to be passed to the contract as sudo |
+| `msg` | [bytes](#bytes) | | Msg json encoded message to be passed to the contract as execute |
 
 
 
@@ -712,10 +712,11 @@ MigrateContractProposal gov proposal content type to migrate a contract.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `title` | [string](#string) | | Title is a short summary |
-| `description` | [string](#string) | | Description is a human readable text |
-| `run_as` | [string](#string) | | FIXME: I think this is unused? Migrate has no sender RunAs is the address that is passed to the contract's environment as sender |
+| `description` | [string](#string) | | Description is a human readable text
+
+Note: skipping 3 as this was previously used for unneeded run_as |
 | `contract` | [string](#string) | | Contract is the address of the smart contract |
-| `code_id` | [uint64](#uint64) | | CodeID references the new WASM code |
+| `code_id` | [uint64](#uint64) | | CodeID references the new WASM codesudo |
 | `msg` | [bytes](#bytes) | | Msg json encoded message to be passed to the contract on migration |
 
 

diff --git a/proto/cosmwasm/wasm/v1/proposal.proto b/proto/cosmwasm/wasm/v1/proposal.proto
@@ -56,12 +56,11 @@ message MigrateContractProposal {
  string title = 1;
  // Description is a human readable text
  string description = 2;
- // FIXME: I think this is unused? Migrate has no sender
- // RunAs is the address that is passed to the contract's environment as sender
- string run_as = 3;
+ // Note: skipping 3 as this was previously used for unneeded run_as
+
  // Contract is the address of the smart contract
  string contract = 4;
- // CodeID references the new WASM code
+ // CodeID references the new WASM codesudo
  uint64 code_id = 5 [ (gogoproto.customname) = "CodeID" ];
  // Msg json encoded message to be passed to the contract on migration
  bytes msg = 6 [ (gogoproto.casttype) = "RawContractMessage" ];
@@ -90,7 +89,7 @@ message ExecuteContractProposal {
  string run_as = 3;
  // Contract is the address of the smart contract
  string contract = 4;
- // Msg json encoded message to be passed to the contract as sudo
+ // Msg json encoded message to be passed to the contract as execute
  bytes msg = 5 [ (gogoproto.casttype) = "RawContractMessage" ];
 }
 

diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
@@ -181,13 +181,6 @@ func ProposalMigrateContractCmd() *cobra.Command {
  return err
  }
 
- runAs, err := cmd.Flags().GetString(flagRunAs)
- if err != nil {
- return fmt.Errorf("run-as: %s", err)
- }
- if len(runAs) == 0 {
- return errors.New("run-as address is required")
- }
  proposalTitle, err := cmd.Flags().GetString(cli.FlagTitle)
  if err != nil {
  return fmt.Errorf("proposal title: %s", err)
@@ -211,7 +204,6 @@ func ProposalMigrateContractCmd() *cobra.Command {
  Contract: src.Contract,
  CodeID: src.CodeID,
  Msg: src.Msg,
- RunAs: runAs,
  }
 
  msg, err := govtypes.NewMsgSubmitProposal(&content, deposit, clientCtx.GetFromAddress())
@@ -225,7 +217,6 @@ func ProposalMigrateContractCmd() *cobra.Command {
  return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
  },
  }
- cmd.Flags().String(flagRunAs, "", "The address that is passed as sender to the contract on proposal execution")
 
  // proposal flags
  cmd.Flags().String(cli.FlagTitle, "", "Title of proposal")

diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
@@ -126,8 +126,6 @@ type MigrateProposalJSONReq struct {
  Contract string `json:"contract" yaml:"contract"`
  Code uint64 `json:"code_id" yaml:"code_id"`
  Msg json.RawMessage `json:"msg" yaml:"msg"`
- // RunAs is the role that is passed to the contract's environment
- RunAs string `json:"run_as" yaml:"run_as"`
 }
 
 func (s MigrateProposalJSONReq) Content() govtypes.Content {
@@ -137,7 +135,6 @@ func (s MigrateProposalJSONReq) Content() govtypes.Content {
  Contract: s.Contract,
  CodeID: s.Code,
  Msg: types.RawContractMessage(s.Msg),
- RunAs: s.RunAs,
  }
 }
 func (s MigrateProposalJSONReq) GetProposer() string {

diff --git a/x/wasm/keeper/proposal_handler.go b/x/wasm/keeper/proposal_handler.go
@@ -103,11 +103,11 @@ func handleMigrateProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.M
  if err != nil {
  return sdkerrors.Wrap(err, "contract")
  }
- runAsAddr, err := sdk.AccAddressFromBech32(p.RunAs)
  if err != nil {
  return sdkerrors.Wrap(err, "run as address")
  }
- data, err := k.Migrate(ctx, contractAddr, runAsAddr, p.CodeID, p.Msg)
+ // runAs is not used if this is permissioned, so just put any valid address there (second contractAddr)
+ data, err := k.Migrate(ctx, contractAddr, contractAddr, p.CodeID, p.Msg)
  if err != nil {
  return err
  }

diff --git a/x/wasm/types/proposal.go b/x/wasm/types/proposal.go
@@ -245,9 +245,6 @@ func (p MigrateContractProposal) ValidateBasic() error {
  if _, err := sdk.AccAddressFromBech32(p.Contract); err != nil {
  return sdkerrors.Wrap(err, "contract")
  }
- if _, err := sdk.AccAddressFromBech32(p.RunAs); err != nil {
- return sdkerrors.Wrap(err, "run as")
- }
  if err := p.Msg.ValidateBasic(); err != nil {
  return sdkerrors.Wrap(err, "payload msg")
  }
@@ -261,9 +258,8 @@ func (p MigrateContractProposal) String() string {
  Description: %s
  Contract: %s
  Code id: %d
- Run as: %s
  Msg %q
-`, p.Title, p.Description, p.Contract, p.CodeID, p.RunAs, p.Msg)
+`, p.Title, p.Description, p.Contract, p.CodeID, p.Msg)
 }
 
 // MarshalYAML pretty prints the migrate message
@@ -274,14 +270,12 @@ func (p MigrateContractProposal) MarshalYAML() (interface{}, error) {
  Contract string `yaml:"contract"`
  CodeID uint64 `yaml:"code_id"`
  Msg string `yaml:"msg"`
- RunAs string `yaml:"run_as"`
  }{
  Title: p.Title,
  Description: p.Description,
  Contract: p.Contract,
  CodeID: p.CodeID,
  Msg: string(p.Msg),
- RunAs: p.RunAs,
  }, nil
 }
 

diff --git a/x/wasm/types/proposal.pb.go b/x/wasm/types/proposal.pb.go
diff --git a/x/wasm/types/test_fixtures.go b/x/wasm/types/test_fixtures.go
@@ -249,7 +249,6 @@ func MigrateContractProposalFixture(mutators ...func(p *MigrateContractProposal)
  Contract: contractAddr,
  CodeID: 1,
  Msg: migMsgBz,
- RunAs: anyAddress,
  }
 
  for _, m := range mutators {