-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
feat: merge wasmd v0.27.0 #570
Conversation
This will not affect functionality whatsoever, it just makes for a more consistent code, as discussed in issue #616.
* Implement PinCodes proposal cli * Implement UnpinCodes proposal cli * Fix descriptions * Apply suggestions from code review Co-authored-by: Alexander Peters <[email protected]> Co-authored-by: Alexander Peters <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #570 +/- ##
==========================================
- Coverage 57.59% 57.54% -0.05%
==========================================
Files 793 796 +3
Lines 86589 87814 +1225
==========================================
+ Hits 49871 50534 +663
- Misses 33558 34107 +549
- Partials 3160 3173 +13
|
go.mod
Outdated
@@ -62,5 +63,7 @@ require ( | |||
replace ( | |||
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 | |||
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 | |||
|
|||
github.com/line/wasmvm => github.com/shiki-tak/wasmvm v0.16.3-testing.0.20220624032404-3e5e9ef10a08 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the following PRs are merged, the latest version is applied.
Finschia/wasmvm#66
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add this PR chagnes to the changelogs.md
simapp/simd/cmd/genaccounts.go
Outdated
addr := sdk.AccAddress(args[0]) | ||
err := sdk.ValidateAccAddress(args[0]) | ||
if err != nil { | ||
inBuf := bufio.NewReader(cmd.InOrStdin()) | ||
keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend) | ||
keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend) //nolint:errcheck |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was an error checking feature on this line, but removed. any reason to remove it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
//nolint:errcheck
was removed because it did not exist. Also, error check was not added here because it was not done in the original simd.
@shiki-tak san, please merge as |
| `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 execute | | ||
| `funds` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | Funds coins that are transferred to the contract on instantiation | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change the protobuf path (maybe it comes from from another file)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is correct because it is the based cosmos proto file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I suggested changing cosmos -> lbm. Is it ok still to be "cosmos.base.v1beta1.Coin"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
||
| Field | Type | Label | Description | | ||
| ----- | ---- | ----- | ----------- | | ||
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an optional pagination for the request. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change the protobuf path (maybe it comes from from another file)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is correct because it is the based cosmos proto file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto.
| Field | Type | Label | Description | | ||
| ----- | ---- | ----- | ----------- | | ||
| `code_ids` | [uint64](#uint64) | repeated | | | ||
| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | pagination defines the pagination in the response. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change the protobuf path (maybe it comes from from another file)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is correct because it is the based cosmos proto file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto.
x/wasm/types/params.go
Outdated
// This is tracked in https://github.com/CosmWasm/wasmd/issues/566 and https://github.com/CosmWasm/wasmd/issues/631. | ||
// Gas adjustments are consensus breaking but may happen in any release marked as consensus breaking. | ||
// Do not make assumptions on how much gas an operation will consume in places that are hard to adjust, | ||
// such as hardcoding them in contracts. | ||
// | ||
// Please not that all gas prices returned to the wasmer engine should have this multiplied |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missed the original change in this line.
62e976a55157c77f6bc2320a827d8851628e10e4
x/wasm/types/proposal_test.go
Outdated
@@ -804,40 +804,6 @@ func TestUnmarshalContentFromJson(t *testing.T) { | |||
} | |||
} | |||
|
|||
func TestProposalJsonSignBytes(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this test deleted?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I deleted the test because it was duplicated in cherry-pick.
@@ -216,7 +216,7 @@ func TestMigrateProposal(t *testing.T) { | |||
} | |||
|
|||
func TestExecuteProposal(t *testing.T) { | |||
ctx, keepers := CreateTestInput(t, false, "staking") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this change included in this commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is because our CreateTestInput has four arguments, unlike the fork source.
// now, try to build a protobuf query | ||
protoRequest = wasmvmtypes.QueryRequest{ | ||
Stargate: &wasmvmtypes.StargateQuery{ | ||
Path: "/cosmos.tx.v1beta1.Service/GetTx", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cosmos -> lbm?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is cosmos ok becase it is the following proto file?
https://github.com/line/lbm-sdk/blob/main/proto/cosmos/tx/v1beta1/service.proto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
x/wasm/wasm_snapshotter.go
Outdated
snapshot.WriteExtensionItem(protoWriter, wasmBytes) | ||
|
||
return false | ||
}) | ||
|
||
return nil | ||
return rerr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Description
closes: #555
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.md
client/docs/swagger-ui/swagger.yaml