Add store code authz #1591

pinosu · 2023-08-31T15:54:20Z

Resolves #1584

codecov · 2023-08-31T16:26:29Z

Codecov Report

Merging #1591 (5aa0689) into main (09b5008) will decrease coverage by 0.02%.
Report is 2 commits behind head on main.
The diff coverage is 59.15%.

@@            Coverage Diff             @@
##             main    #1591      +/-   ##
==========================================
- Coverage   56.59%   56.58%   -0.02%     
==========================================
  Files          64       64              
  Lines        8755     8886     +131     
==========================================
+ Hits         4955     5028      +73     
- Misses       3414     3468      +54     
- Partials      386      390       +4

Files Changed	Coverage Δ
x/wasm/keeper/api.go	`71.42% <ø> (ø)`
x/wasm/types/context.go	`20.83% <0.00%> (-8.58%)`	⬇️
x/wasm/client/cli/tx.go	`15.21% <29.41%> (+1.99%)`	⬆️
x/wasm/types/authz.go	`81.96% <76.19%> (-1.44%)`	⬇️
app/ante.go	`65.51% <100.00%> (+1.23%)`	⬆️
app/app.go	`86.41% <100.00%> (+0.02%)`	⬆️
x/wasm/ioutils/ioutil.go	`100.00% <100.00%> (ø)`
x/wasm/keeper/ante.go	`100.00% <100.00%> (ø)`
x/wasm/keeper/keeper.go	`85.56% <100.00%> (+0.04%)`	⬆️
x/wasm/keeper/keeper_cgo.go	`93.75% <100.00%> (ø)`
... and 4 more

alpe

Good start! I have added some quick feedback

proto/cosmwasm/wasm/v1/authz.proto

alpe · 2023-09-01T08:51:39Z

x/wasm/types/authz.go

+}
+
+// NewAuthz factory method to create an Authorization with updated grants
+func (a StoreCodeAuthorization) NewAuthz(g []CodeGrant) authztypes.Authorization {


This is the same as NewStoreCodeAuthorization . Do you need a second constructor?

alpe

Thanks for the updates. Good progress!
I have added some nits but also comments to spec out some edge cases.

x/wasm/types/authz.go

alpe · 2023-09-06T07:28:02Z

x/wasm/types/authz_test.go

+	}{
+		"all good": {
+			setup: func(t *testing.T) validatable {
+				t.Helper()


I found this t.Helper() not very helpful in table tests therefore I removed the linter. Let's keep setup functions to the minimum

x/wasm/types/authz_test.go

x/wasm/types/authz.go

alpe · 2023-09-06T07:40:47Z

x/wasm/types/authz_test.go

+			expErr: sdkerrors.ErrInvalidRequest,
+		},
+	}
+	for name, spec := range specs {


👍 good test cases

x/wasm/types/codec.go

alpe

Good progress!

alpe · 2023-09-11T07:02:35Z

x/wasm/ioutils/ioutil.go

 )

+var errLimit = errorsmod.Register("wasm", 29, "exceeds limit")


let's not register a new error type outside of types/errors . You can just make this a regular stdlib error. In the method call you can check for the concrete type if needed and use a registered type. Please make sure that this error type is public

alpe · 2023-09-11T07:05:03Z

x/wasm/types/authz.go

+		// TODO: consume gas
+		wasmCode, err := ioutils.Uncompress(code, int64(MaxWasmSize))
+		if err != nil {
+			return authztypes.AcceptResponse{}, sdkerrors.ErrInvalidRequest.Wrap(errorsmod.Wrap(err, "uncompress wasm archive").Error())


This line would work with a Go stdlib error without a change. The error message is wrapped into a ErrInvalidRequest type. The registered errLimit namespace/code is ignored anyway.

alpe · 2023-09-11T07:13:54Z

x/wasm/types/authz.go

 			return errorsmod.Wrapf(err, "position %d", i)
 		}
+		for j := i + 1; j < len(a.Grants); j++ {
+			if strings.EqualFold(string(a.Grants[i].CodeHash), string(a.Grants[i].CodeHash)) {


This is always true. One of the grants should be found by j.
Alternatively, you can store the codehashes in a map and compare the len to be equal len(grants)

alpe · 2023-09-11T07:17:01Z

x/wasm/types/authz.go

-const gasDeserializationCostPerByte = uint64(1)
+const (
+	gasDeserializationCostPerByte = uint64(1)
+	codehashWildcard              = "*"


let's make the wildcard public so that it can be used from other packages if needed

alpe

Very good progress. 🏄

alpe · 2023-09-13T07:27:38Z

x/wasm/types/authz.go

+	default:
+		uniqueGrants := make(map[string]struct{})
+		for i, grant := range a.Grants {
+			if strings.EqualFold(string(grant.CodeHash), CodehashWildcard) {


nice use of switch len() here so that you always have >1 elements here for the wilcard check 👍

x/wasm/types/authz.go

alpe · 2023-09-13T07:30:17Z

x/wasm/types/authz.go

+			if err := grant.ValidateBasic(); err != nil {
+				return errorsmod.Wrapf(err, "position %d", i)
+			}
+			uniqueGrants[strings.ToLower(string(grant.CodeHash))] = struct{}{}


good normalization

x/wasm/types/authz.go

x/wasm/ioutils/ioutil.go

app/ante.go

x/wasm/keeper/ante.go

alpe · 2023-09-13T10:31:54Z

x/wasm/keeper/keeper.go

@@ -145,6 +145,11 @@ func (k Keeper) GetAuthority() string {
 	return k.authority
 }

+// GetGasRegister returns the x/wasm module's gas register.
+func (k Keeper) GetGasRegister() GasRegister {


👍 makes sense

alpe · 2023-09-13T10:32:30Z

x/wasm/types/authz.go

+	permission := *storeMsg.InstantiatePermission
+
+	if ioutils.IsGzip(code) {
+		gasRegister, ok := GasRegister(ctx)


x/wasm/types/context.go

alpe

Great job! 🥇

alpe · 2023-09-14T09:24:32Z

proto/cosmwasm/wasm/v1/authz.proto

 import "google/protobuf/any.proto";
 import "amino/amino.proto";

 option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
 option (gogoproto.goproto_getters_all) = false;

+// StoreCodeAuthorization defines authorization for wasm code upload.


// Since: wasmd 0.42

* main: Add store code authz (#1591) Handle query for non ibc contracts Test channels query Start rework channel query Restrict pagination on all state query

webmaster128 · 2023-10-09T22:32:41Z

proto/cosmwasm/wasm/v1/authz.proto

+message CodeGrant {
+  // CodeHash is the unique identifier created by wasmvm
+  // Wildcard "*" is used to specify any kind of grant.
+  bytes code_hash = 1;


Is there a reason why this is not a string? All checksums are lower case hex string in the CosmWasm stack when they are visible for users. This thing needs to be displayed as part of transaction signing.

What kind of bytes are expected here? 32 raw bytes hash output or the hex string?

yes, it was kept as bytes to keep consistency with other code_hash/checksum attributes in the proto files such as:

message CodeInfo { // CodeHash is the unique identifier created by wasmvm bytes code_hash = 1;

and

message MsgStoreCodeResponse { // CodeID is the reference to the stored WASM code uint64 code_id = 1 [ (gogoproto.customname) = "CodeID" ]; // Checksum is the sha256 hash of the stored code bytes checksum = 2; }

Okay, but please note that all bytes fields are problematic for transaction signing. "*" will be shown as code_hash : Kg== to the user when verifying a transaction. An actual hash is shown as an unreadable base64 string.

Not much we can do here now since this is released I guess.

Thanks for pointing this out. I will be more careful in the future.
Maybe in future releases we can fix all these fields and have migrations for them. I don't think it will be too difficult.

No worries. We have similar issues in many places in the stack. We'll figure it out eventually.

alpe reviewed Sep 1, 2023

View reviewed changes

alpe reviewed Sep 6, 2023

View reviewed changes

alpe reviewed Sep 11, 2023

View reviewed changes

pinosu added 5 commits September 11, 2023 23:12

Start implementation

7bb058a

Add implementation + some e2e test

26166f9

Fix lint

a0bbd4f

Fix comments

cb08623

Add ante handler

ade4fd9

pinosu force-pushed the 1584-storecode_authz branch from 9c205fe to ade4fd9 Compare September 11, 2023 21:13

pinosu added 4 commits September 12, 2023 02:18

Add cli cmd + more test cases

59062c0

Add cli tests

d00a935

Add ante handler test

da737db

Add more tests

116540f

pinosu changed the title ~~[WIP] Add store code authz~~ Add store code authz Sep 12, 2023

pinosu marked this pull request as ready for review September 12, 2023 10:40

alpe reviewed Sep 13, 2023

View reviewed changes

pinosu added 3 commits September 13, 2023 15:31

Fix comments

75fce70

Enable empty permissions for the grant

8177d76

Fix lint

3045f91

alpe approved these changes Sep 14, 2023

View reviewed changes

Update version

5aa0689

pinosu merged commit dd22204 into main Sep 14, 2023

alpe added a commit that referenced this pull request Sep 15, 2023

Merge branch 'main' into sdk-upgrade050_rebased3

dbc9460

* main: Add store code authz (#1591) Handle query for non ibc contracts Test channels query Start rework channel query Restrict pagination on all state query

webmaster128 reviewed Oct 9, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add store code authz #1591

Add store code authz #1591

pinosu commented Aug 31, 2023 •

edited by alpe

Loading

codecov bot commented Aug 31, 2023 •

edited

Loading

alpe left a comment

alpe Sep 1, 2023

alpe left a comment

alpe Sep 6, 2023

alpe Sep 6, 2023

alpe left a comment

alpe Sep 11, 2023

alpe Sep 11, 2023

alpe Sep 11, 2023

alpe Sep 11, 2023

alpe left a comment

alpe Sep 13, 2023

alpe Sep 13, 2023

alpe Sep 13, 2023

alpe Sep 13, 2023

alpe left a comment

alpe Sep 14, 2023

webmaster128 Oct 9, 2023 •

edited

Loading

pinosu Oct 10, 2023

webmaster128 Oct 11, 2023

pinosu Oct 11, 2023

webmaster128 Oct 11, 2023

		)

		var errLimit = errorsmod.Register("wasm", 29, "exceeds limit")

Add store code authz #1591

Add store code authz #1591

Conversation

pinosu commented Aug 31, 2023 • edited by alpe Loading

codecov bot commented Aug 31, 2023 • edited Loading

Codecov Report

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webmaster128 Oct 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pinosu commented Aug 31, 2023 •

edited by alpe

Loading

codecov bot commented Aug 31, 2023 •

edited

Loading

webmaster128 Oct 9, 2023 •

edited

Loading