Update tgrade contracts to v0.3.0-rc2 #85
Conversation
x/poe/contract/contractio.go
Outdated
| @@ -37,7 +39,21 @@ func RegisterValidator(ctx sdk.Context, contractAddr sdk.AccAddress, pk cryptoty | |||
| } | |||
|
|
|||
| _, err = k.Execute(ctx, contractAddr, delegatorAddress, payloadBz, nil) | |||
| return sdkerrors.Wrap(err, "execute contract") | |||
| return sdkerrors.Wrap(err, "execute contract: register validator") | |||
x/poe/contract/msg.go
Outdated
| @@ -128,9 +129,11 @@ func asJson(t *testing.T, m interface{}) string { | |||
| // TG4ValsetExecute Valset contract validator key registration | |||
| // See https://github.com/confio/tgrade-contracts/blob/main/contracts/tgrade-valset/schema/execute_msg.json | |||
| type TG4ValsetExecute struct { | |||
| RegisterValidatorKey RegisterValidatorKey `json:"register_validator_key"` | |||
| RegisterValidatorKey *RegisterValidatorKey `json:"register_validator_key,omitempty"` | |||
| UpdateMetadata *stakingtypes.Description `json:"update_metadata,omitempty"` | |||
There was a problem hiding this comment.
pp: I had avoided to use sdk types mostly as they could change by a version upgrade. It is not ideal to manually maintain these object types here but we need to ensure stability in some way.
There was a problem hiding this comment.
I had made a unique type, then realized it was the same, so why.
I can make a custom type that matches the contracts (not protobuf) and add a conversion function.
There was a problem hiding this comment.
Done in 0a21e3f
There was a problem hiding this comment.
Very nice to see the contract integration.
The new queries look useful but they are not fully integrated into the stack without adding them to GRPC
Some improvements would be:
- Cover the
UpdateValidatorfunctionality with tests - Add CLI command for update (edit) validator
- Support new queries via GRPC endpoint
- Add CLI support for new queries
- Test new queries (end to end) via system tests
| @@ -1 +1 @@ | |||
| v0.3.0-rc1 | |||
| v0.3.0-rc2 | |||
| return response.UnbondingPeriod, err | ||
| } | ||
|
|
||
| func doQuery(ctx sdk.Context, k *twasmkeeper.Keeper, contractAddr sdk.AccAddress, query interface{}, result interface{}) error { |
I agree, but I got stuck as your testing is so much different than wasmd that I didn't know where to start. I wanted to make some keeper tests and do the queries, but couldn't figure out how to do so. Last time I tried to test something on tgrade I spent 3 hours porting over helpers from wasmd and then you said it was the wrong approach. I would ask to merge this in with the infrastructure (and maybe adding the queries to grpc?) and I would ask you to add the cli and tgrade system tests. Maybe you can teach me how this work one day |
|
Okay, made the requested adjustments. The missing "features" like exposing queries, cli, and system tests I will leave for another PR. I feel these belong to #87 (which should have an extended scope possibly) |
Closes #84
TODO:
Not sure how to test all these, as there are no clear keeper tests I can model on.
I would ask to merge this and the rest can be built out in #87 (as it seems many tests are system level integration tests that need cli tools)