LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(runtime): define address codec providers in runtime (backport #17037) (#17043)

Browse Source 
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
mergify[bot]
2023-07-18 16:38:14 +02:00
committed by GitHub
co-authored by Julien Robert
parent 2049c4b82a
commit 6ddf0af2e7
47 changed files with 245 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simapp/app.go
+1
View File
@@ -647,6 +647,7 @@ func (app *SimApp) AutoCliOpts() autocli.AppOptions {
return autocli.AppOptions{
Modules: modules,
ModuleOptions: runtimeservices.ExtractAutoCLIOptions(app.ModuleManager.Modules),
AddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()),
ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()),
simapp/app_test.go
+5 -5
View File
@@ -21,6 +21,7 @@ import (
"cosmossdk.io/x/upgrade"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/testutil/mock"
"github.com/cosmos/cosmos-sdk/testutil/network"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
@@ -41,7 +42,6 @@ import (
"github.com/cosmos/cosmos-sdk/x/params"
"github.com/cosmos/cosmos-sdk/x/slashing"
"github.com/cosmos/cosmos-sdk/x/staking"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
)
func TestSimAppExportAndBlockedAddrs(t *testing.T) {
@@ -315,8 +315,8 @@ func (c customAddressCodec) BytesToString(bz []byte) (string, error) {
func TestAddressCodecFactory(t *testing.T) {
var addrCodec address.Codec
var valAddressCodec stakingtypes.ValidatorAddressCodec
var consAddressCodec stakingtypes.ConsensusAddressCodec
var valAddressCodec runtime.ValidatorAddressCodec
var consAddressCodec runtime.ConsensusAddressCodec
err := depinject.Inject(
depinject.Configs(
@@ -342,8 +342,8 @@ func TestAddressCodecFactory(t *testing.T) {
depinject.Supply(
log.NewNopLogger(),
func() address.Codec { return customAddressCodec{} },
func() stakingtypes.ValidatorAddressCodec { return customAddressCodec{} },
func() stakingtypes.ConsensusAddressCodec { return customAddressCodec{} },
func() runtime.ValidatorAddressCodec { return customAddressCodec{} },
func() runtime.ConsensusAddressCodec { return customAddressCodec{} },
),
),
&addrCodec, &valAddressCodec, &consAddressCodec)
simapp/app_v2.go
+3 -3
View File
@@ -146,10 +146,10 @@ func NewSimApp(
// For provinding a different validator and consensus address codec, add it below.
// By default the staking module uses the bech32 prefix provided in the auth config,
// and appends "valoper" and "valcons" for validator and consensus addresses respectively.
// When providing a custom address codec in auth, a custom codec must be provided here as well.
// When providing a custom address codec in auth, custom address codecs must be provided here as well.
//
// func() stakingtypes.ValidatorAddressCodec { return <- custom validator address codec type -> }
// func() stakingtypes.ConsensusAddressCodec { return <- custom consensus address codec type -> }
// func() runtime.ValidatorAddressCodec { return <- custom validator address codec type -> }
// func() runtime.ConsensusAddressCodec { return <- custom consensus address codec type -> }
//
// MINT
simapp/go.mod
+2 -2
View File
@@ -3,8 +3,8 @@ module cosmossdk.io/simapp
go 1.20
require (
cosmossdk.io/api v0.6.1
cosmossdk.io/client/v2 v2.0.0-20230714081549-1da193f2bfeb
cosmossdk.io/api v0.7.0
cosmossdk.io/client/v2 v2.0.0-20230718142100-ecfe9a30184a
cosmossdk.io/core v0.9.0
cosmossdk.io/depinject v1.0.0-alpha.3
cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca
simapp/go.sum
+4 -4
View File
@@ -187,10 +187,10 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX
cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
cosmossdk.io/api v0.6.1 h1:F+tr/ntynNk2WvUcUtc556DsUnqNOvtOwPBQWdhZQlg=
cosmossdk.io/api v0.6.1/go.mod h1:kJFAEMLN57y0viszHDPLMmieF0471o5QAwwApa+270M=
cosmossdk.io/client/v2 v2.0.0-20230714081549-1da193f2bfeb h1:nEg4A1Q98U2Gpnzh4cx9fcv85JSf3GpW7vr+7HB/GFw=
cosmossdk.io/client/v2 v2.0.0-20230714081549-1da193f2bfeb/go.mod h1:OyG2Eh+UK+x3UBIfpXD3+KqBbHOTTwmaAGviySgn4Uk=
cosmossdk.io/api v0.7.0 h1:QsEMIWuv9xWDbF2HZnW4Lpu1/SejCztPu0LQx7t6MN4=
cosmossdk.io/api v0.7.0/go.mod h1:kJFAEMLN57y0viszHDPLMmieF0471o5QAwwApa+270M=
cosmossdk.io/client/v2 v2.0.0-20230718142100-ecfe9a30184a h1:Px4DJUyl6xscUEy44h8fhMWo2O2m59am5Fdpvoo4cCA=
cosmossdk.io/client/v2 v2.0.0-20230718142100-ecfe9a30184a/go.mod h1:vbcnjiPyYaYBM1FEAxpMpJsUsb4KxqX0ySxUuBnOEOY=
cosmossdk.io/collections v0.3.0 h1:v0eEqLBxebAV+t+Ahwf9tSJOu95HVLINwROXx2TTZ08=
cosmossdk.io/collections v0.3.0/go.mod h1:CHE1+niUElL9ikCpevRZcp0yqQ4TU0TrEEGirN0mvIg=
cosmossdk.io/core v0.9.0 h1:30ScAOHDIUOCg1DKAwqkho9wuQJnu7GUrMcg0XLioic=