Skip to content

Commit 04a13bc

Browse files
author
Alex | Interchain Labs
authored
Merge branch 'main' into store/factory_migration
2 parents b5b2fa0 + eb1211a commit 04a13bc

File tree

111 files changed

+2166
-920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2166
-920
lines changed

.github/.codespellignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ cips
22
pullrequest
33
keypair
44
pastTime
5-
hasTables
65
Nam
76
EyT
87
upTo
9-
pullRequests
8+
pullRequests
9+
AccountAt
10+
expRes
11+
hasTables

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
5353
### Bug Fixes
5454

5555
* (query) [23002](https://github.com/cosmos/cosmos-sdk/pull/23002) Fix collection filtered pagination.
56+
* (x/auth/tx) [#23170](https://github.com/cosmos/cosmos-sdk/pull/23170) Avoid panic from newWrapperFromDecodedTx when AuthInfo.Fee is optional in decodedTx.
5657
* (x/auth/tx) [23144](https://github.com/cosmos/cosmos-sdk/pull/23144) Add missing CacheWithValue for ExtensionOptions.
5758
* (x/auth/tx) [#23148](https://github.com/cosmos/cosmos-sdk/pull/23148) Avoid panic from intoAnyV2 when v1.PublicKey is optional.
5859

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Our Pledge
44

5-
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socioeconomic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
66

77
## Our Standards
88

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
require (
1515
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.1-20240130113600-88ef6483f90f.1 // indirect
1616
github.com/google/go-cmp v0.6.0 // indirect
17-
golang.org/x/net v0.32.0 // indirect
17+
golang.org/x/net v0.33.0 // indirect
1818
golang.org/x/sys v0.28.0 // indirect
1919
golang.org/x/text v0.21.0 // indirect
2020
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect

api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
1010
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
1111
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1212
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
13-
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
14-
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
13+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
14+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
1515
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
1616
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1717
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=

client/config/toml.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func writeConfigFile(configFilePath string, config interface{}) error {
7373
return os.WriteFile(configFilePath, buffer.Bytes(), 0o600)
7474
}
7575

76-
// getClientConfig reads values from client.toml file and unmarshalls them into ClientConfig
76+
// getClientConfig reads values from client.toml file and unmarshals them into ClientConfig
7777
func getClientConfig(configPath string, v *viper.Viper) (*Config, error) {
7878
v.AddConfigPath(configPath)
7979
v.SetConfigName("client")

client/v2/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
3636

3737
## [Unreleased]
3838

39+
* [#23325](https://github.com/cosmos/cosmos-sdk/pull/23325) Remove `NewAppOptionsFromConfig` that isn't needed in normal wiring.
40+
3941
## [v2.10.0-beta.1](https://github.com/cosmos/cosmos-sdk/releases/tag/client/v2/v2.10.0-beta.1) - 2024-12-18
4042

4143
### Features

client/v2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ To sign a file `sign-file` command offers some helpful flags:
304304
--encoding string Choose an encoding method for the file content to be added as msg data (no-encoding|base64|hex) (default "no-encoding")
305305
--indent string Choose an indent for the tx (default " ")
306306
--notEmitUnpopulated Don't show unpopulated fields in the tx
307-
--output string Choose an output format for the tx (json|text (default "json")
307+
--output string Choose an output format for the tx (json|text) (default "json")
308308
--output-document string The document will be written to the given file instead of STDOUT
309309
```
310310

client/v2/autocli/app.go

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package autocli
22

33
import (
4-
"github.com/cosmos/gogoproto/proto"
54
"github.com/spf13/cobra"
65
"google.golang.org/protobuf/reflect/protoregistry"
76

@@ -10,12 +9,9 @@ import (
109
"cosmossdk.io/core/address"
1110
"cosmossdk.io/core/appmodule"
1211
"cosmossdk.io/depinject"
13-
"cosmossdk.io/log"
14-
"cosmossdk.io/x/tx/signing"
1512

1613
sdkflags "github.com/cosmos/cosmos-sdk/client/flags"
1714
"github.com/cosmos/cosmos-sdk/codec"
18-
"github.com/cosmos/cosmos-sdk/codec/types"
1915
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
2016
)
2117

@@ -143,49 +139,3 @@ func (appOptions AppOptions) EnhanceRootCommandWithBuilder(rootCmd *cobra.Comman
143139

144140
return nil
145141
}
146-
147-
// NewAppOptionsFromConfig returns AppOptions for an app based on the provided modulesConfig and moduleOptions.
148-
// It returns an AppOptions instance usable for CLI parsing but not execution. For an execution usable AppOptions
149-
// see ProvideAppOptions, which expects input to be filled by depinject.
150-
func NewAppOptionsFromConfig(
151-
modulesConfig depinject.Config,
152-
moduleOptions map[string]*autocliv1.ModuleOptions,
153-
) (AppOptions, error) {
154-
interfaceRegistry, err := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{
155-
ProtoFiles: proto.HybridResolver,
156-
SigningOptions: signing.Options{
157-
AddressCodec: nopAddressCodec{},
158-
ValidatorAddressCodec: nopAddressCodec{},
159-
},
160-
})
161-
if err != nil {
162-
return AppOptions{}, err
163-
}
164-
cfg := struct {
165-
depinject.In
166-
Modules map[string]appmodule.AppModule
167-
}{
168-
Modules: nil,
169-
}
170-
err = depinject.Inject(depinject.Configs(
171-
modulesConfig,
172-
depinject.Supply(
173-
log.NewNopLogger(),
174-
)), &cfg)
175-
if err != nil {
176-
return AppOptions{}, err
177-
}
178-
179-
return AppOptions{
180-
Modules: cfg.Modules,
181-
ModuleOptions: moduleOptions,
182-
skipValidation: true,
183-
Cdc: codec.NewProtoCodec(interfaceRegistry),
184-
}, nil
185-
}
186-
187-
type nopAddressCodec struct{}
188-
189-
func (nopAddressCodec) StringToBytes(_ string) ([]byte, error) { return nil, nil }
190-
191-
func (nopAddressCodec) BytesToString(_ []byte) (string, error) { return "", nil }

client/v2/autocli/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func writeConfigFile(configFilePath string, config *Config) error {
114114
return os.WriteFile(configFilePath, b, 0o600)
115115
}
116116

117-
// readConfig reads values from client.toml file and unmarshalls them into ClientConfig
117+
// readConfig reads values from client.toml file and unmarshals them into ClientConfig
118118
func readConfig(configPath string, v *viper.Viper) (*Config, error) {
119119
v.AddConfigPath(configPath)
120120
v.SetConfigName("client")

0 commit comments

Comments
 (0)