Skip to content

Commit 08ac91c

Browse files
beer-1beer-1
committed
bump dependencies && add fetchprice ibc module
1 parent ec699bc commit 08ac91c

File tree

3 files changed

+196
-159
lines changed

3 files changed

+196
-159
lines changed

‎app/app.go

Lines changed: 69 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,17 @@ import (
9393
porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
9494
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
9595
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
96+
solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine"
97+
ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
9698

9799
// initia imports
98100
initialanes "github.com/initia-labs/initia/app/lanes"
99101
"github.com/initia-labs/initia/app/params"
102+
"github.com/initia-labs/initia/x/ibc/fetchprice"
103+
fetchpriceconsumer "github.com/initia-labs/initia/x/ibc/fetchprice/consumer"
104+
fetchpriceconsumerkeeper "github.com/initia-labs/initia/x/ibc/fetchprice/consumer/keeper"
105+
fetchpriceconsumertypes "github.com/initia-labs/initia/x/ibc/fetchprice/consumer/types"
106+
fetchpricetypes "github.com/initia-labs/initia/x/ibc/fetchprice/types"
100107
ibctestingtypes "github.com/initia-labs/initia/x/ibc/testing/types"
101108
icaauth "github.com/initia-labs/initia/x/intertx"
102109
icaauthkeeper "github.com/initia-labs/initia/x/intertx/keeper"
@@ -183,31 +190,33 @@ type MinitiaApp struct {
183190
memKeys map[string]*storetypes.MemoryStoreKey
184191

185192
// keepers
186-
AccountKeeper *authkeeper.AccountKeeper
187-
BankKeeper *bankkeeper.BaseKeeper
188-
CapabilityKeeper *capabilitykeeper.Keeper
189-
UpgradeKeeper *upgradekeeper.Keeper
190-
GroupKeeper *groupkeeper.Keeper
191-
ConsensusParamsKeeper *consensusparamkeeper.Keeper
192-
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
193-
TransferKeeper *ibctransferkeeper.Keeper
194-
AuthzKeeper *authzkeeper.Keeper
195-
FeeGrantKeeper *feegrantkeeper.Keeper
196-
ICAHostKeeper *icahostkeeper.Keeper
197-
ICAControllerKeeper *icacontrollerkeeper.Keeper
198-
ICAAuthKeeper *icaauthkeeper.Keeper
199-
IBCFeeKeeper *ibcfeekeeper.Keeper
200-
WasmKeeper *wasmkeeper.Keeper
201-
OPChildKeeper *opchildkeeper.Keeper
202-
AuctionKeeper *auctionkeeper.Keeper // x/auction keeper used to process bids for POB auctions
193+
AccountKeeper *authkeeper.AccountKeeper
194+
BankKeeper *bankkeeper.BaseKeeper
195+
CapabilityKeeper *capabilitykeeper.Keeper
196+
UpgradeKeeper *upgradekeeper.Keeper
197+
GroupKeeper *groupkeeper.Keeper
198+
ConsensusParamsKeeper *consensusparamkeeper.Keeper
199+
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
200+
TransferKeeper *ibctransferkeeper.Keeper
201+
AuthzKeeper *authzkeeper.Keeper
202+
FeeGrantKeeper *feegrantkeeper.Keeper
203+
ICAHostKeeper *icahostkeeper.Keeper
204+
ICAControllerKeeper *icacontrollerkeeper.Keeper
205+
ICAAuthKeeper *icaauthkeeper.Keeper
206+
IBCFeeKeeper *ibcfeekeeper.Keeper
207+
WasmKeeper *wasmkeeper.Keeper
208+
OPChildKeeper *opchildkeeper.Keeper
209+
AuctionKeeper *auctionkeeper.Keeper // x/auction keeper used to process bids for POB auctions
210+
FetchPriceConsumerKeeper *fetchpriceconsumerkeeper.Keeper
203211

204212
// make scoped keepers public for test purposes
205-
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
206-
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
207-
ScopedICAHostKeeper capabilitykeeper.ScopedKeeper
208-
ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper
209-
ScopedICAAuthKeeper capabilitykeeper.ScopedKeeper
210-
ScopedWasmKeeper capabilitykeeper.ScopedKeeper
213+
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
214+
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
215+
ScopedICAHostKeeper capabilitykeeper.ScopedKeeper
216+
ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper
217+
ScopedICAAuthKeeper capabilitykeeper.ScopedKeeper
218+
ScopedWasmKeeper capabilitykeeper.ScopedKeeper
219+
ScopedFetchPriceConsumerKeeper capabilitykeeper.ScopedKeeper
211220

212221
// the module manager
213222
ModuleManager *module.Manager
@@ -250,7 +259,8 @@ func NewMinitiaApp(
250259
ibcexported.StoreKey, upgradetypes.StoreKey, ibctransfertypes.StoreKey,
251260
capabilitytypes.StoreKey, authzkeeper.StoreKey, feegrant.StoreKey,
252261
icahosttypes.StoreKey, icacontrollertypes.StoreKey, icaauthtypes.StoreKey,
253-
ibcfeetypes.StoreKey, wasmtypes.StoreKey, opchildtypes.StoreKey, auctiontypes.StoreKey,
262+
ibcfeetypes.StoreKey, wasmtypes.StoreKey, opchildtypes.StoreKey,
263+
auctiontypes.StoreKey, fetchpriceconsumertypes.StoreKey,
254264
)
255265
tkeys := storetypes.NewTransientStoreKeys()
256266
memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -295,6 +305,7 @@ func NewMinitiaApp(
295305
scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
296306
scopedICAAuthKeeper := app.CapabilityKeeper.ScopeToModule(icaauthtypes.ModuleName)
297307
scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
308+
scopedFetchPriceConsumerKeeper := app.CapabilityKeeper.ScopeToModule(fetchpriceconsumertypes.SubModuleName)
298309

299310
app.CapabilityKeeper.Seal()
300311

@@ -497,6 +508,33 @@ func NewMinitiaApp(
497508
wasmIBCModule := wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCFeeKeeper)
498509
wasmIBCStack := ibcfee.NewIBCMiddleware(wasmIBCModule, *app.IBCFeeKeeper)
499510

511+
///////////////////////////////////////
512+
// fetchprice provider configuration //
513+
///////////////////////////////////////
514+
var fetchpriceConsumerStack porttypes.IBCModule
515+
{
516+
app.FetchPriceConsumerKeeper = fetchpriceconsumerkeeper.NewKeeper(
517+
appCodec,
518+
runtime.NewKVStoreService(keys[fetchpriceconsumertypes.StoreKey]),
519+
ac,
520+
// ics4wrapper: fetchprice consumer -> fee
521+
app.IBCFeeKeeper,
522+
app.IBCKeeper.ChannelKeeper,
523+
app.IBCKeeper.PortKeeper,
524+
scopedFetchPriceConsumerKeeper,
525+
)
526+
527+
fetchpriceConsumerModule := fetchpriceconsumer.NewIBCModule(
528+
appCodec,
529+
*app.FetchPriceConsumerKeeper,
530+
)
531+
fetchpriceConsumerStack = ibcfee.NewIBCMiddleware(
532+
// receive: fee -> fetchprice consumer
533+
fetchpriceConsumerModule,
534+
*app.IBCFeeKeeper,
535+
)
536+
}
537+
500538
//////////////////////////////
501539
// IBC router Configuration //
502540
//////////////////////////////
@@ -507,7 +545,8 @@ func NewMinitiaApp(
507545
AddRoute(icahosttypes.SubModuleName, icaHostStack).
508546
AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
509547
AddRoute(icaauthtypes.ModuleName, icaControllerStack).
510-
AddRoute(wasmtypes.ModuleName, wasmIBCStack)
548+
AddRoute(wasmtypes.ModuleName, wasmIBCStack).
549+
AddRoute(fetchpricetypes.ModuleName, fetchpriceConsumerStack)
511550

512551
app.IBCKeeper.SetRouter(ibcRouter)
513552

@@ -586,6 +625,9 @@ func NewMinitiaApp(
586625
icaModule,
587626
icaAuthModule,
588627
ibcfee.NewAppModule(*app.IBCFeeKeeper),
628+
ibctm.NewAppModule(),
629+
solomachine.NewAppModule(),
630+
fetchprice.NewAppModule(appCodec, app.FetchPriceConsumerKeeper, nil),
589631
)
590632

591633
// BasicModuleManager defines the module BasicManager is in charge of setting up basic,
@@ -633,7 +675,8 @@ func NewMinitiaApp(
633675
opchildtypes.ModuleName, genutiltypes.ModuleName, authz.ModuleName, group.ModuleName,
634676
upgradetypes.ModuleName, feegrant.ModuleName, consensusparamtypes.ModuleName, ibcexported.ModuleName,
635677
ibctransfertypes.ModuleName, icatypes.ModuleName, icaauthtypes.ModuleName,
636-
ibcfeetypes.ModuleName, consensusparamtypes.ModuleName, auctiontypes.ModuleName, wasmtypes.ModuleName,
678+
ibcfeetypes.ModuleName, consensusparamtypes.ModuleName, auctiontypes.ModuleName,
679+
wasmtypes.ModuleName, fetchpricetypes.ModuleName,
637680
}
638681

639682
app.ModuleManager.SetOrderInitGenesis(genesisModuleOrder...)

‎go.mod

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,46 @@ require (
66
cosmossdk.io/api v0.7.2
77
cosmossdk.io/client/v2 v2.0.0-beta.1
88
cosmossdk.io/core v0.11.0
9-
cosmossdk.io/errors v1.0.0
10-
cosmossdk.io/log v1.2.1
9+
cosmossdk.io/errors v1.0.1
10+
cosmossdk.io/log v1.3.0
1111
cosmossdk.io/math v1.2.0
12-
cosmossdk.io/store v1.0.1
12+
cosmossdk.io/store v1.0.2
1313
cosmossdk.io/tools/confix v0.1.1
1414
cosmossdk.io/x/feegrant v0.1.0
1515
cosmossdk.io/x/upgrade v0.1.1
1616
// we also need to update `LIBWASMVM_VERSION` of images/private/Dockerfile#5
1717
github.com/CosmWasm/wasmd v0.50.0
1818
github.com/cometbft/cometbft v0.38.2
1919
github.com/cosmos/cosmos-db v1.0.0
20-
github.com/cosmos/cosmos-sdk v0.50.2
20+
github.com/cosmos/cosmos-sdk v0.50.3
2121
github.com/cosmos/go-bip39 v1.0.0
2222
github.com/cosmos/gogoproto v1.4.11
2323
github.com/cosmos/ibc-go/modules/capability v1.0.0
2424
github.com/cosmos/ibc-go/v8 v8.0.0
2525
github.com/golang/mock v1.6.0
2626
github.com/gorilla/mux v1.8.1
27-
github.com/initia-labs/OPinit v0.2.0-beta.0
28-
github.com/initia-labs/initia v0.2.0-beta.0
27+
github.com/initia-labs/OPinit v0.2.0-beta.1
28+
github.com/initia-labs/initia v0.2.0-beta.5
2929
github.com/pkg/errors v0.9.1
30-
github.com/prometheus/client_golang v1.17.0
30+
github.com/prometheus/client_golang v1.18.0
3131
github.com/rakyll/statik v0.1.7
3232
github.com/skip-mev/block-sdk v0.0.0-20231213233341-deceeb0e993b
33-
github.com/spf13/cast v1.5.1
33+
github.com/spf13/cast v1.6.0
3434
github.com/spf13/cobra v1.8.0
35-
github.com/spf13/viper v1.17.0
35+
github.com/spf13/viper v1.18.2
3636
github.com/stretchr/testify v1.8.4
3737
)
3838

3939
require (
40-
cloud.google.com/go v0.110.9 // indirect
41-
cloud.google.com/go/compute v1.23.2 // indirect
40+
cloud.google.com/go v0.110.10 // indirect
41+
cloud.google.com/go/compute v1.23.3 // indirect
4242
cloud.google.com/go/compute/metadata v0.2.3 // indirect
43-
cloud.google.com/go/iam v1.1.4 // indirect
44-
cloud.google.com/go/storage v1.30.1 // indirect
43+
cloud.google.com/go/iam v1.1.5 // indirect
44+
cloud.google.com/go/storage v1.35.1 // indirect
4545
cosmossdk.io/collections v0.4.0 // indirect
4646
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
4747
cosmossdk.io/x/evidence v0.1.0 // indirect
48-
cosmossdk.io/x/tx v0.12.0 // indirect
48+
cosmossdk.io/x/tx v0.13.0 // indirect
4949
filippo.io/edwards25519 v1.0.0 // indirect
5050
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
5151
github.com/99designs/keyring v1.2.1 // indirect
@@ -56,7 +56,7 @@ require (
5656
github.com/beorn7/perks v1.0.1 // indirect
5757
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
5858
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
59-
github.com/bits-and-blooms/bitset v1.8.0 // indirect
59+
github.com/bits-and-blooms/bitset v1.13.0 // indirect
6060
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
6161
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6262
github.com/cespare/xxhash v1.1.0 // indirect
@@ -90,9 +90,9 @@ require (
9090
github.com/emicklei/dot v1.6.0 // indirect
9191
github.com/fatih/color v1.16.0 // indirect
9292
github.com/felixge/httpsnoop v1.0.4 // indirect
93-
github.com/fsnotify/fsnotify v1.6.0 // indirect
93+
github.com/fsnotify/fsnotify v1.7.0 // indirect
9494
github.com/getsentry/sentry-go v0.25.0 // indirect
95-
github.com/go-kit/kit v0.12.0 // indirect
95+
github.com/go-kit/kit v0.13.0 // indirect
9696
github.com/go-kit/log v0.2.1 // indirect
9797
github.com/go-logfmt/logfmt v0.6.0 // indirect
9898
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
@@ -101,17 +101,17 @@ require (
101101
github.com/golang/glog v1.2.0 // indirect
102102
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
103103
github.com/golang/protobuf v1.5.3 // indirect
104-
github.com/golang/snappy v0.0.4 // indirect
104+
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
105105
github.com/google/btree v1.1.2 // indirect
106106
github.com/google/go-cmp v0.6.0 // indirect
107107
github.com/google/gofuzz v1.2.0 // indirect
108108
github.com/google/orderedcode v0.0.1 // indirect
109109
github.com/google/s2a-go v0.1.7 // indirect
110-
github.com/google/uuid v1.3.1 // indirect
111-
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
110+
github.com/google/uuid v1.4.0 // indirect
111+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
112112
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
113113
github.com/gorilla/handlers v1.5.2 // indirect
114-
github.com/gorilla/websocket v1.5.0 // indirect
114+
github.com/gorilla/websocket v1.5.1 // indirect
115115
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
116116
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
117117
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
@@ -152,7 +152,7 @@ require (
152152
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
153153
github.com/oklog/run v1.1.0 // indirect
154154
github.com/opencontainers/go-digest v1.0.0 // indirect
155-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
155+
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
156156
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
157157
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
158158
github.com/prometheus/client_model v0.5.0 // indirect
@@ -162,11 +162,12 @@ require (
162162
github.com/rogpeppe/go-internal v1.11.0 // indirect
163163
github.com/rs/cors v1.8.3 // indirect
164164
github.com/rs/zerolog v1.31.0 // indirect
165-
github.com/sagikazarmark/locafero v0.3.0 // indirect
165+
github.com/sagikazarmark/locafero v0.4.0 // indirect
166166
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
167167
github.com/sasha-s/go-deadlock v0.3.1 // indirect
168+
github.com/skip-mev/slinky v0.0.0-20240117193954-22f7433da9a4 // indirect
168169
github.com/sourcegraph/conc v0.3.0 // indirect
169-
github.com/spf13/afero v1.10.0 // indirect
170+
github.com/spf13/afero v1.11.0 // indirect
170171
github.com/spf13/pflag v1.0.5 // indirect
171172
github.com/subosito/gotenv v1.6.0 // indirect
172173
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
@@ -178,22 +179,23 @@ require (
178179
go.etcd.io/bbolt v1.3.8 // indirect
179180
go.opencensus.io v0.24.0 // indirect
180181
go.uber.org/multierr v1.11.0 // indirect
181-
golang.org/x/crypto v0.16.0 // indirect
182+
golang.org/x/crypto v0.18.0 // indirect
182183
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
183-
golang.org/x/net v0.19.0 // indirect
184-
golang.org/x/oauth2 v0.12.0 // indirect
184+
golang.org/x/net v0.20.0 // indirect
185+
golang.org/x/oauth2 v0.15.0 // indirect
185186
golang.org/x/sync v0.5.0 // indirect
186-
golang.org/x/sys v0.15.0 // indirect
187-
golang.org/x/term v0.15.0 // indirect
187+
golang.org/x/sys v0.16.0 // indirect
188+
golang.org/x/term v0.16.0 // indirect
188189
golang.org/x/text v0.14.0 // indirect
190+
golang.org/x/time v0.5.0 // indirect
189191
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
190-
google.golang.org/api v0.143.0 // indirect
191-
google.golang.org/appengine v1.6.7 // indirect
192-
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
193-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
194-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
195-
google.golang.org/grpc v1.59.0 // indirect
196-
google.golang.org/protobuf v1.31.0 // indirect
192+
google.golang.org/api v0.153.0 // indirect
193+
google.golang.org/appengine v1.6.8 // indirect
194+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
195+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
196+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
197+
google.golang.org/grpc v1.60.1 // indirect
198+
google.golang.org/protobuf v1.32.0 // indirect
197199
gopkg.in/ini.v1 v1.67.0 // indirect
198200
gopkg.in/yaml.v2 v2.4.0 // indirect
199201
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -208,7 +210,7 @@ replace (
208210
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
209211

210212
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf
211-
github.com/cosmos/cosmos-sdk => github.com/initia-labs/cosmos-sdk v0.0.0-20240103092915-bf1e1bc520d0
213+
github.com/cosmos/cosmos-sdk => github.com/initia-labs/cosmos-sdk v0.0.0-20240116115600-110a2328c217
212214

213215
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
214216
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134

0 commit comments

Comments
 (0)