Skip to content

Commit 7be7044

Browse files
yan-soonyan-soon
committed
update cometbft psuedo ver
1 parent 6293729 commit 7be7044

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎baseapp/abci.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,11 +1028,11 @@ func (app *BaseApp) FetchOracleVotes(req *abci.RequestFetchOracleVotes) (*abci.R
10281028
return &abci.ResponseFetchOracleVotes{}, fmt.Errorf("fetchOracleVotes hook is not set")
10291029
}
10301030

1031-
func (app *BaseApp) DoesOracleResultExist(req *abci.RequestDoesOracleResultExist) (*abci.ResponseDoesOracleResultExist, error) {
1032-
if app.doesOracleResultExist != nil {
1033-
return app.doesOracleResultExist(context.Background(), req)
1031+
func (app *BaseApp) FetchOracleResults(req *abci.RequestFetchOracleResults) (*abci.ResponseFetchOracleResults, error) {
1032+
if app.fetchOracleResults != nil {
1033+
return app.fetchOracleResults(context.Background(), req)
10341034
}
1035-
return &abci.ResponseDoesOracleResultExist{}, fmt.Errorf("doesOracleResultExist hook is not set")
1035+
return &abci.ResponseFetchOracleResults{}, fmt.Errorf("fetchOracleResults hook is not set")
10361036
}
10371037

10381038
func (app *BaseApp) DoesSubAccountBelongToVal(req *abci.RequestDoesSubAccountBelongToVal) (*abci.ResponseDoesSubAccountBelongToVal, error) {

‎baseapp/baseapp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ type customMiddlewares struct {
204204
afterCommitter sdk.AfterCommitter // logic to run after committing state
205205
createOracleResultTx sdk.CreateOracleResultTxHandler
206206
fetchOracleVotes sdk.FetchOracleVotesHandler
207-
doesOracleResultExist sdk.DoesOracleResultExistHandler
207+
fetchOracleResults sdk.FetchOracleResultsHandler
208208
doesSubAccountBelongToVal sdk.DoesSubAccountBelongToValHandler
209209
validateOracleVotes sdk.ValidateOracleVotesHandler
210210
beforeInternalFinalizeBlock func(blockHeight int64)

‎baseapp/options.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ func (app *BaseApp) SetFetchOracleVotes(fetchOracleVotes sdk.FetchOracleVotesHan
260260
app.fetchOracleVotes = fetchOracleVotes
261261
}
262262

263-
func (app *BaseApp) SetDoesOracleResultExist(doesOracleResultExist sdk.DoesOracleResultExistHandler) {
263+
func (app *BaseApp) SetFetchOracleResults(fetchOracleResults sdk.FetchOracleResultsHandler) {
264264
if app.sealed {
265-
panic("SetDoesOracleResultExist() on sealed BaseApp")
265+
panic("SetFetchOracleResults() on sealed BaseApp")
266266
}
267267

268-
app.doesOracleResultExist = doesOracleResultExist
268+
app.fetchOracleResults = fetchOracleResults
269269
}
270270

271271
func (app *BaseApp) SetDoesSubAccountBelongToVal(doesSubAccountBelongToVal sdk.DoesSubAccountBelongToValHandler) {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ replace (
173173
// cosmossdk.io/math => github.com/Switcheo/cosmos-sdk/math v0.0.0-20231002062306-8360748679d2
174174
// use cosmos fork of keyring
175175
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
176-
github.com/cometbft/cometbft => github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8
176+
github.com/cometbft/cometbft => github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4
177177
// github.com/cosmos/iavl => github.com/Switcheo/iavl v0.20.1-0.20230907092650-a292b5c6f6ae
178178
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
179179
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE
4040
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
4141
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
4242
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
43-
github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8 h1:fUFOV4miyinRQRgdZnTcfmMAyHqbf3B8SVRZehOxhc4=
44-
github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8/go.mod h1:0tqKin+KQs8zDwzYD8rPHzSBIDNPuB4NrwwGDNb/hUg=
43+
github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4 h1:2sJAjSl6qiWsVChpxvvoElLBUCWT+hDyW4T4rd398no=
44+
github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4/go.mod h1:0tqKin+KQs8zDwzYD8rPHzSBIDNPuB4NrwwGDNb/hUg=
4545
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
4646
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
4747
github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I=

‎server/cmt_abci.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ func (w cometABCIWrapper) FetchOracleVotes(_ context.Context, req *abci.RequestF
5252
return w.app.FetchOracleVotes(req)
5353
}
5454

55-
func (w cometABCIWrapper) DoesOracleResultExist(_ context.Context, req *abci.RequestDoesOracleResultExist) (*abci.ResponseDoesOracleResultExist, error) {
56-
return w.app.DoesOracleResultExist(req)
55+
func (w cometABCIWrapper) FetchOracleResults(_ context.Context, req *abci.RequestFetchOracleResults) (*abci.ResponseFetchOracleResults, error) {
56+
return w.app.FetchOracleResults(req)
5757
}
5858

5959
func (w cometABCIWrapper) DoesSubAccountBelongToVal(_ context.Context, req *abci.RequestDoesSubAccountBelongToVal) (*abci.ResponseDoesSubAccountBelongToVal, error) {

‎server/types/abci.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type ABCI interface {
3838
// Hooks
3939
CreateOracleResultTx(*abci.RequestCreateOracleResultTx) (*abci.ResponseCreateOracleResultTx, error)
4040
FetchOracleVotes(*abci.RequestFetchOracleVotes) (*abci.ResponseFetchOracleVotes, error)
41-
DoesOracleResultExist(*abci.RequestDoesOracleResultExist) (*abci.ResponseDoesOracleResultExist, error)
41+
FetchOracleResults(*abci.RequestFetchOracleResults) (*abci.ResponseFetchOracleResults, error)
4242
DoesSubAccountBelongToVal(*abci.RequestDoesSubAccountBelongToVal) (*abci.ResponseDoesSubAccountBelongToVal, error)
4343
ValidateOracleVotes(*abci.RequestValidateOracleVotes) (*abci.ResponseValidateOracleVotes, error)
4444
}

‎simapp/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ require (
210210
replace (
211211
// use cosmos fork of keyring
212212
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
213-
github.com/cometbft/cometbft => github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8
213+
github.com/cometbft/cometbft => github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4
214214
// Simapp always use the latest version of the cosmos-sdk
215215
github.com/cosmos/cosmos-sdk => ../.
216216
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.

‎simapp/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE
238238
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
239239
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
240240
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
241-
github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8 h1:fUFOV4miyinRQRgdZnTcfmMAyHqbf3B8SVRZehOxhc4=
242-
github.com/Switcheo/cometbft v0.38.6-0.20240722124433-29628c8806a8/go.mod h1:0tqKin+KQs8zDwzYD8rPHzSBIDNPuB4NrwwGDNb/hUg=
241+
github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4 h1:2sJAjSl6qiWsVChpxvvoElLBUCWT+hDyW4T4rd398no=
242+
github.com/Switcheo/cometbft v0.38.6-0.20241209083642-ed468a4228b4/go.mod h1:0tqKin+KQs8zDwzYD8rPHzSBIDNPuB4NrwwGDNb/hUg=
243243
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
244244
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
245245
github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I=

‎types/abci.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type CreateOracleResultTxHandler func(Context, *abci.RequestCreateOracleResultTx
3030

3131
type FetchOracleVotesHandler func(context.Context, *abci.RequestFetchOracleVotes) (*abci.ResponseFetchOracleVotes, error)
3232

33-
type DoesOracleResultExistHandler func(context.Context, *abci.RequestDoesOracleResultExist) (*abci.ResponseDoesOracleResultExist, error)
33+
type FetchOracleResultsHandler func(context.Context, *abci.RequestFetchOracleResults) (*abci.ResponseFetchOracleResults, error)
3434

3535
type DoesSubAccountBelongToValHandler func(context.Context, *abci.RequestDoesSubAccountBelongToVal) (*abci.ResponseDoesSubAccountBelongToVal, error)
3636

0 commit comments

Comments
 (0)
⚡