Skip to content

Commit d70f49c

Browse files
colin-axnercolin-axner
authored
update to SDK beta release (#167)
* update SDK commit * bump to SDK v0.43.0-beta1 tag
1 parent 31166f2 commit d70f49c

File tree

6 files changed

+29
-66
lines changed

6 files changed

+29
-66
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp
77
require (
88
github.com/armon/go-metrics v0.3.8
99
github.com/confio/ics23/go v0.6.6
10-
github.com/cosmos/cosmos-sdk v0.43.0-alpha1.0.20210504090054-e3e89f52607b
10+
github.com/cosmos/cosmos-sdk v0.43.0-beta1
1111
github.com/gogo/protobuf v1.3.3
1212
github.com/golang/protobuf v1.5.2
1313
github.com/gorilla/mux v1.8.0

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:
6262
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
6363
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
65-
github.com/armon/go-metrics v0.3.7/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
6665
github.com/armon/go-metrics v0.3.8 h1:oOxq3KPj0WhCuy50EhzwiyMyG2ovRQZpZLXQuOh2a/M=
6766
github.com/armon/go-metrics v0.3.8/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
6867
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -129,15 +128,16 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
129128
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
130129
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
131130
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
132-
github.com/cosmos/cosmos-sdk v0.43.0-alpha1.0.20210504090054-e3e89f52607b h1:5AOuxO9jaK+89wdCMj2e75GC1qQRXeYGYOUfqdN/Kb0=
133-
github.com/cosmos/cosmos-sdk v0.43.0-alpha1.0.20210504090054-e3e89f52607b/go.mod h1:u/SsFuAiyrBlVafgDQF/hbLzeEaA7w9XmKw3QiJm3G4=
131+
github.com/cosmos/cosmos-sdk v0.43.0-beta1 h1:cfRZY+opamo+zF+MuEbvriZwoSzfCuEh1fqUM8fFHbg=
132+
github.com/cosmos/cosmos-sdk v0.43.0-beta1/go.mod h1:rpCPaC3MnityU4Io4CDZqZB4GMtPqNeYXxPk8iRqmYM=
134133
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
135134
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
136135
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
137136
github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE=
138137
github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I=
139-
github.com/cosmos/iavl v0.15.3 h1:xE9r6HW8GeKeoYJN4zefpljZ1oukVScP/7M8oj6SUts=
140138
github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4=
139+
github.com/cosmos/iavl v0.16.0 h1:ICIOB8xysirTX27GmVAaoeSpeozzgSu9d49w36xkVJA=
140+
github.com/cosmos/iavl v0.16.0/go.mod h1:2A8O/Jz9YwtjqXMO0CjnnbTYEEaovE8jWcwrakH3PoE=
141141
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
142142
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
143143
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
@@ -525,8 +525,8 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
525525
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
526526
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
527527
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
528-
github.com/otiai10/copy v1.5.1 h1:a/cs2E1/1V0az8K5nblbl+ymEa4E11AfaOLMar8V34w=
529-
github.com/otiai10/copy v1.5.1/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
528+
github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ=
529+
github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
530530
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
531531
github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI=
532532
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=

‎modules/apps/transfer/client/cli/tx.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/cosmos/cosmos-sdk/client/flags"
1111
"github.com/cosmos/cosmos-sdk/client/tx"
1212
sdk "github.com/cosmos/cosmos-sdk/types"
13-
"github.com/cosmos/cosmos-sdk/types/msgservice"
1413
"github.com/cosmos/cosmos-sdk/version"
1514
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
1615
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
@@ -97,14 +96,7 @@ to the counterparty channel. Any timeout set to 0 is disabled.`),
9796
msg := types.NewMsgTransfer(
9897
srcPort, srcChannel, coin, sender, receiver, timeoutHeight, timeoutTimestamp,
9998
)
100-
svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
101-
msgClient := types.NewMsgClient(svcMsgClientConn)
102-
_, err = msgClient.Transfer(cmd.Context(), msg)
103-
if err != nil {
104-
return err
105-
}
106-
107-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
99+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
108100
},
109101
}
110102

‎modules/core/02-client/client/cli/tx.go

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/cosmos/cosmos-sdk/client/tx"
1414
"github.com/cosmos/cosmos-sdk/codec"
1515
sdk "github.com/cosmos/cosmos-sdk/types"
16-
"github.com/cosmos/cosmos-sdk/types/msgservice"
1716
"github.com/cosmos/cosmos-sdk/version"
1817
govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli"
1918
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -76,14 +75,7 @@ func NewCreateClientCmd() *cobra.Command {
7675
return err
7776
}
7877

79-
svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
80-
msgClient := types.NewMsgClient(svcMsgClientConn)
81-
_, err = msgClient.CreateClient(cmd.Context(), msg)
82-
if err != nil {
83-
return err
84-
}
85-
86-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
78+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
8779
},
8880
}
8981

@@ -129,14 +121,7 @@ func NewUpdateClientCmd() *cobra.Command {
129121
return err
130122
}
131123

132-
svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
133-
msgClient := types.NewMsgClient(svcMsgClientConn)
134-
_, err = msgClient.UpdateClient(cmd.Context(), msg)
135-
if err != nil {
136-
return err
137-
}
138-
139-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
124+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
140125
},
141126
}
142127
}
@@ -177,14 +162,7 @@ func NewSubmitMisbehaviourCmd() *cobra.Command {
177162
return err
178163
}
179164

180-
svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
181-
msgClient := types.NewMsgClient(svcMsgClientConn)
182-
_, err = msgClient.SubmitMisbehaviour(cmd.Context(), msg)
183-
if err != nil {
184-
return err
185-
}
186-
187-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
165+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
188166
},
189167
}
190168
}
@@ -247,14 +225,7 @@ func NewUpgradeClientCmd() *cobra.Command {
247225
return err
248226
}
249227

250-
svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
251-
msgClient := types.NewMsgClient(svcMsgClientConn)
252-
_, err = msgClient.UpgradeClient(cmd.Context(), msg)
253-
if err != nil {
254-
return err
255-
}
256-
257-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
228+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
258229
},
259230
}
260231

‎testing/simapp/app.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ import (
5555
"github.com/cosmos/cosmos-sdk/x/evidence"
5656
evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
5757
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
58-
feegrant "github.com/cosmos/cosmos-sdk/x/feegrant"
58+
"github.com/cosmos/cosmos-sdk/x/feegrant"
5959
feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
60-
feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant/types"
60+
feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
6161
"github.com/cosmos/cosmos-sdk/x/genutil"
6262
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
6363
"github.com/cosmos/cosmos-sdk/x/gov"
@@ -95,7 +95,7 @@ import (
9595

9696
authz "github.com/cosmos/cosmos-sdk/x/authz"
9797
authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
98-
authztypes "github.com/cosmos/cosmos-sdk/x/authz/types"
98+
authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
9999

100100
// unnamed import of statik for swagger UI support
101101
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
@@ -126,12 +126,12 @@ var (
126126
crisis.AppModuleBasic{},
127127
slashing.AppModuleBasic{},
128128
ibc.AppModuleBasic{},
129-
feegrant.AppModuleBasic{},
129+
feegrantmodule.AppModuleBasic{},
130130
upgrade.AppModuleBasic{},
131131
evidence.AppModuleBasic{},
132132
transfer.AppModuleBasic{},
133133
ibcmock.AppModuleBasic{},
134-
authz.AppModuleBasic{},
134+
authzmodule.AppModuleBasic{},
135135
vesting.AppModuleBasic{},
136136
)
137137

@@ -229,9 +229,9 @@ func NewSimApp(
229229
keys := sdk.NewKVStoreKeys(
230230
authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
231231
minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
232-
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegranttypes.StoreKey,
232+
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
233233
evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
234-
authztypes.StoreKey,
234+
authzkeeper.StoreKey,
235235
)
236236
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
237237
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -285,7 +285,7 @@ func NewSimApp(
285285
app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName,
286286
)
287287

288-
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegranttypes.StoreKey], app.AccountKeeper)
288+
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)
289289
app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp)
290290

291291
// register the staking hooks
@@ -299,7 +299,7 @@ func NewSimApp(
299299
appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper,
300300
)
301301

302-
app.AuthzKeeper = authzkeeper.NewKeeper(keys[authztypes.StoreKey], appCodec, app.BaseApp.MsgServiceRouter())
302+
app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.BaseApp.MsgServiceRouter())
303303

304304
// register the proposal types
305305
govRouter := govtypes.NewRouter()
@@ -356,7 +356,7 @@ func NewSimApp(
356356
bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
357357
capability.NewAppModule(appCodec, *app.CapabilityKeeper),
358358
crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
359-
feegrant.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
359+
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
360360
gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
361361
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
362362
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
@@ -366,7 +366,7 @@ func NewSimApp(
366366
evidence.NewAppModule(app.EvidenceKeeper),
367367
ibc.NewAppModule(app.IBCKeeper),
368368
params.NewAppModule(app.ParamsKeeper),
369-
authz.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
369+
authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
370370
transferModule,
371371
mockModule,
372372
)
@@ -389,8 +389,8 @@ func NewSimApp(
389389
app.mm.SetOrderInitGenesis(
390390
capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, stakingtypes.ModuleName,
391391
slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, crisistypes.ModuleName,
392-
ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authztypes.ModuleName, ibctransfertypes.ModuleName,
393-
ibcmock.ModuleName, feegranttypes.ModuleName,
392+
ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, ibctransfertypes.ModuleName,
393+
ibcmock.ModuleName, feegrant.ModuleName,
394394
)
395395

396396
app.mm.RegisterInvariants(&app.CrisisKeeper)
@@ -409,15 +409,15 @@ func NewSimApp(
409409
auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts),
410410
bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
411411
capability.NewAppModule(appCodec, *app.CapabilityKeeper),
412-
feegrant.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
412+
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
413413
gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
414414
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
415415
staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
416416
distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
417417
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
418418
params.NewAppModule(app.ParamsKeeper),
419419
evidence.NewAppModule(app.EvidenceKeeper),
420-
authz.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
420+
authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
421421
ibc.NewAppModule(app.IBCKeeper),
422422
transferModule,
423423
)

‎testing/simapp/sim_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
sdk "github.com/cosmos/cosmos-sdk/types"
1919
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
2020
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
21-
authztypes "github.com/cosmos/cosmos-sdk/x/authz/types"
21+
authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
2222
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2323
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
2424
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -178,7 +178,7 @@ func TestAppImportExport(t *testing.T) {
178178
{app.keys[capabilitytypes.StoreKey], newApp.keys[capabilitytypes.StoreKey], [][]byte{}},
179179
{app.keys[ibchost.StoreKey], newApp.keys[ibchost.StoreKey], [][]byte{}},
180180
{app.keys[ibctransfertypes.StoreKey], newApp.keys[ibctransfertypes.StoreKey], [][]byte{}},
181-
{app.keys[authztypes.StoreKey], newApp.keys[authztypes.StoreKey], [][]byte{}},
181+
{app.keys[authzkeeper.StoreKey], newApp.keys[authzkeeper.StoreKey], [][]byte{}},
182182
}
183183

184184
for _, skp := range storeKeysPrefixes {

0 commit comments

Comments
 (0)