Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add grant system tests #1626

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Add grant system tests #1626

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73195e8
Add grant system tests
pinosu Sep 14, 2023
4f5b006
Add unpermissioned chain test case
pinosu Sep 15, 2023
da98318
Fix tests
pinosu Sep 15, 2023
e15f052
Update cli and fix feedbacks
pinosu Sep 15, 2023
c5a9537
Revisit CLI and system tests (#1627)
alpe Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/system/fraud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
)

func TestRecursiveMsgsExternalTrigger(t *testing.T) {
sut.ResetChain(t)
alpe marked this conversation as resolved.
Show resolved Hide resolved
const maxBlockGas = 2_000_000
sut.ModifyGenesisJSON(t, SetConsensusMaxGas(t, maxBlockGas))
sut.StartChain(t)
Expand Down
12 changes: 12 additions & 0 deletions tests/system/genesis_io.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,15 @@ func GetGenesisBalance(rawGenesis []byte, addr string) sdk.Coins {
}
return r
}

// SetCodeUploadPermission sets the code upload permissions
func SetCodeUploadPermission(t *testing.T, permission string, addresses []string) GenesisMutator {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

personal preference :-)

Suggested change
func SetCodeUploadPermission(t *testing.T, permission string, addresses []string) GenesisMutator {
func SetCodeUploadPermission(t *testing.T, permission string, addresses ...string) GenesisMutator {

return func(genesis []byte) []byte {
t.Helper()
state, err := sjson.Set(string(genesis), "app_state.wasm.params.code_upload_access.permission", permission)
require.NoError(t, err)
state, err = sjson.Set(state, "app_state.wasm.params.code_upload_access.addresses", addresses)
require.NoError(t, err)
return []byte(state)
}
alpe marked this conversation as resolved.
Show resolved Hide resolved
}
115 changes: 115 additions & 0 deletions tests/system/grant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
//go:build system_test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 would it make sense to rename the file to permissioned_test to emphasize this is not about grants only?


package system

import (
"os"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"
)

func TestGrantStoreCodePermissionedChain(t *testing.T) {
sut.ResetChain(t)
cli := NewWasmdCLI(t, sut, verbose)

// add genesis account with some tokens
account1Addr := cli.AddKey("account1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

account1 and 2 are not very verbose. Can think about the role that the address represents?
Maybe something like chain_authorization and dev ?


// add genesis account with some tokens
account2Addr := cli.AddKey("account2")

sut.ModifyGenesisCLI(t,
[]string{"genesis", "add-genesis-account", account1Addr, "100000000stake"},
)
sut.ModifyGenesisCLI(t,
[]string{"genesis", "add-genesis-account", account2Addr, "100000000stake"},
)

//set params
sut.ModifyGenesisJSON(t, SetCodeUploadPermission(t, "AnyOfAddresses", []string{account1Addr}))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

alpe marked this conversation as resolved.
Show resolved Hide resolved
sut.StartChain(t)

// query params
rsp := cli.CustomQuery("q", "wasm", "params")
permission := gjson.Get(rsp, "code_upload_access.permission").String()
addrRes := gjson.Get(rsp, "code_upload_access.addresses").Array()
assert.Equal(t, 1, len(addrRes))

assert.Equal(t, permission, "AnyOfAddresses")
assert.Equal(t, account1Addr, addrRes[0].Str)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: please make these 3 asserts require instead to exit the test early


// address1 grant upload permission to address2
rsp = cli.CustomCommand("tx", "wasm", "grant-store-code", account2Addr, "*:*", "--from="+account1Addr)
RequireTxSuccess(t, rsp)

// address2 store code fails
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// address2 store code fails
// address2 store code fails as the address is not in the code-upload accept-list

rsp = cli.CustomCommand("tx", "wasm", "store", "./testdata/hackatom.wasm.gzip", "--from="+account2Addr, "--gas=1500000", "--fees=2stake")
RequireTxFailure(t, rsp)

// create tx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// create tx
// create tx should work for addresses in the accept-list

args := cli.withTXFlags("tx", "wasm", "store", "./testdata/hackatom.wasm.gzip", "--from="+account1Addr, "--generate-only")
tx, ok := cli.run(args)
require.True(t, ok)

pathToTx := filepath.Join(t.TempDir(), "tx.json")
err := os.WriteFile(pathToTx, []byte(tx), os.FileMode(0o744))
require.NoError(t, err)

// address2 authz exec store code should succeed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// address2 authz exec store code should succeed
// store code via authz execution uses the given grant and should succeed

rsp = cli.CustomCommand("tx", "authz", "exec", pathToTx, "--from="+account2Addr, "--gas=1500000", "--fees=2stake")
RequireTxSuccess(t, rsp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice. It works :-)

}

func TestGrantStoreCode(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nice but let's focus on the permissioned chain use case and drop this to reduce test time. E2E tests and TestGrantStoreCodePermissionedChain give us confidence already that client and server side are working as expected

sut.ResetChain(t)
cli := NewWasmdCLI(t, sut, verbose)

// add genesis account with some tokens
account1Addr := cli.AddKey("account1")

// add genesis account with some tokens
account2Addr := cli.AddKey("account2")

sut.ModifyGenesisCLI(t,
[]string{"genesis", "add-genesis-account", account1Addr, "100000000stake"},
)
sut.ModifyGenesisCLI(t,
[]string{"genesis", "add-genesis-account", account2Addr, "100000000stake"},
)

sut.StartChain(t)

// address1 grant upload permission to address2
rsp := cli.CustomCommand("tx", "wasm", "grant-store-code", account2Addr, "*:nobody", "--from="+account1Addr)
RequireTxSuccess(t, rsp)

// create tx - permission everybody
args := cli.withTXFlags("tx", "wasm", "store", "./testdata/hackatom.wasm.gzip", "--instantiate-everybody=true", "--from="+account1Addr, "--generate-only")
tx, ok := cli.run(args)
require.True(t, ok)

pathToTx := filepath.Join(t.TempDir(), "tx.json")
err := os.WriteFile(pathToTx, []byte(tx), os.FileMode(0o744))
require.NoError(t, err)

// address2 authz exec fails because instantiate permissions do not match
rsp = cli.CustomCommand("tx", "authz", "exec", pathToTx, "--from="+account2Addr, "--gas=1500000", "--fees=2stake")
RequireTxFailure(t, rsp)

// create tx - permission nobody
args = cli.withTXFlags("tx", "wasm", "store", "./testdata/hackatom.wasm.gzip", "--instantiate-nobody=true", "--from="+account1Addr, "--generate-only")
tx, ok = cli.run(args)
require.True(t, ok)

pathToTx = filepath.Join(t.TempDir(), "tx.json")
err = os.WriteFile(pathToTx, []byte(tx), os.FileMode(0o744))
require.NoError(t, err)

// address2 authz exec succeeds
rsp = cli.CustomCommand("tx", "authz", "exec", pathToTx, "--from="+account2Addr, "--gas=1500000", "--fees=2stake")
RequireTxSuccess(t, rsp)
}
1 change: 0 additions & 1 deletion tests/system/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ type GenesisMutator func([]byte) []byte
// return state
// }
func (s *SystemUnderTest) ModifyGenesisJSON(t *testing.T, mutators ...GenesisMutator) {
s.ResetChain(t)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any genesis modification should build upon a clean state. This line ensures this. I would be good to keep it as it was. I have commented on the test how to avoid the overwrite

s.modifyGenesisJSON(t, mutators...)
}

Expand Down
14 changes: 5 additions & 9 deletions x/wasm/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,15 +560,15 @@ $ %s tx grant <grantee_addr> execution <contract_addr> --allow-all-messages --ma

func GrantStoreCodeAuthorizationCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "grant [grantee] store-code [code_hash:permission]",
Use: "grant-store-code [grantee] [code_hash:permission]",
alpe marked this conversation as resolved.
Show resolved Hide resolved
Short: "Grant authorization to an address",
Long: fmt.Sprintf(`Grant authorization to an address.
Examples:
$ %s tx grant <grantee_addr> store-code 13a1fc994cc6d1c81b746ee0c0ff6f90043875e0bf1d9be6b7d779fc978dc2a5:everybody 1wqrtry681b746ee0c0ff6f90043875e0bf1d9be6b7d779fc978dc2a5:nobody --expiration 1667979596
$ %s tx grant-store-code <grantee_addr> 13a1fc994cc6d1c81b746ee0c0ff6f90043875e0bf1d9be6b7d779fc978dc2a5:everybody 1wqrtry681b746ee0c0ff6f90043875e0bf1d9be6b7d779fc978dc2a5:nobody --expiration 1667979596

$ %s tx grant <grantee_addr> store-code *:%s1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm,%s1vx8knpllrj7n963p9ttd80w47kpacrhuts497x
$ %s tx grant-store-code <grantee_addr> *:%s1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm,%s1vx8knpllrj7n963p9ttd80w47kpacrhuts497x
`, version.AppName, version.AppName, version.AppName, version.AppName),
Args: cobra.MinimumNArgs(3),
Args: cobra.MinimumNArgs(2),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientTxContext(cmd)
if err != nil {
Expand All @@ -580,11 +580,7 @@ $ %s tx grant <grantee_addr> store-code *:%s1l2rsakp388kuv9k8qzq6lrm9taddae7fpx5
return err
}

if args[1] != "store-code" {
return fmt.Errorf("%s authorization type not supported", args[1])
}

grants, err := parseStoreCodeGrants(args[2:])
grants, err := parseStoreCodeGrants(args[1:])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions x/wasm/types/authz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (a *StoreCodeAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authztype
}

code := storeMsg.WASMByteCode
permission := *storeMsg.InstantiatePermission
permission := storeMsg.InstantiatePermission

if ioutils.IsGzip(code) {
gasRegister, ok := GasRegisterFromContext(ctx)
Expand Down Expand Up @@ -127,7 +127,7 @@ func (g CodeGrant) ValidateBasic() error {
}

// Accept checks if checksum and permission match the grant
func (g CodeGrant) Accept(checksum []byte, permission AccessConfig) bool {
func (g CodeGrant) Accept(checksum []byte, permission *AccessConfig) bool {
if !strings.EqualFold(string(g.CodeHash), CodehashWildcard) && !bytes.EqualFold(g.CodeHash, checksum) {
return false
}
Expand Down