Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[R4R] Issue581 new #142

Merged
merged 17 commits into from
May 28, 2019
Merged

[R4R] Issue581 new #142

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
18b9c16
Merge pull request #75 from binance-chain/develop
ackratos Mar 4, 2019
ce8925b
Merge pull request #76 from binance-chain/develop
ackratos Mar 4, 2019
be0e7ed
Merge pull request #80 from binance-chain/release/0.25.0-binance.9
rickyyangz Mar 9, 2019
0cd5e7a
Merge pull request #82 from binance-chain/develop
rickyyangz Mar 9, 2019
fa4356b
Merge pull request #84 from binance-chain/develop
rickyyangz Mar 9, 2019
5e1fcb3
readme: fix clone example url
notatestuser Mar 12, 2019
6a7986d
Merge pull request #89 from binance-chain/develop
yutianwu Mar 18, 2019
ea7ec9a
Merge pull request #94 from binance-chain/develop
yutianwu Mar 20, 2019
ca4e37c
[R4R] prepare release v0.25.0-binance.15 (#105)
Apr 1, 2019
1d6db4f
Merge branch 'release/v0.25.0-binance.16' into oldmaster
rickyyangz Apr 12, 2019
2fbc5aa
Merge pull request #118 from binance-chain/release/v0.25.0-binance.16
rickyyangz Apr 12, 2019
7b2491f
Merge pull request #120 from binance-chain/develop
yutianwu Apr 16, 2019
1988a75
#581 pass tx source into msg handler via context
ackratos May 20, 2019
eb85398
Merge pull request #133 from binance-chain/issue581
ackratos May 27, 2019
be2fce3
Revert "[R4R] #581 pass tx source into msg handler via context"
ackratos May 27, 2019
05f8cc7
Merge pull request #140 from binance-chain/revert-133-issue581
ackratos May 27, 2019
1bcf6c2
bring back #581 pass tx source into msg handler via context (on top o…
ackratos May 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions baseapp/baseapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ var dbHeaderKey = []byte("header")
const (
// we pass txHash of current handling message via context so that we can publish it as metadata of Msg
TxHashKey = "txHash"
// we pass txSrc of current handling message via context so that we can publish it as metadata of Msg
TxSourceKey = "txSrc"
//this number should be around the size of the transactions in a block, TODO: configurable
TxMsgCacheSize = 4000
)
Expand Down Expand Up @@ -726,7 +728,7 @@ func (app *BaseApp) getContextWithCache(mode sdk.RunTxMode, txBytes []byte, txHa
}

// Iterates through msgs and executes them
func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, txHash string, mode sdk.RunTxMode) (result sdk.Result) {
func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode sdk.RunTxMode) (result sdk.Result) {
// accumulate results
logs := make([]string, 0, len(msgs))
var data []byte // NOTE: we just append them all (?!)
Expand All @@ -740,7 +742,7 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, txHash string, mode
return sdk.ErrUnknownRequest("Unrecognized Msg type: " + msgRoute).Result()
}

msgResult := handler(ctx.WithValue(TxHashKey, txHash).WithRunTxMode(mode), msg)
msgResult := handler(ctx.WithRunTxMode(mode), msg)
msgResult.Tags = append(msgResult.Tags, sdk.MakeTag("action", []byte(msg.Type())))

// Append Data and Tags
Expand Down Expand Up @@ -830,7 +832,14 @@ func (app *BaseApp) RunTx(mode sdk.RunTxMode, txBytes []byte, tx sdk.Tx, txHash
}
}

result = app.runMsgs(ctx, msgs, txHash, mode)
var txSrc int64
if stdTx, ok := tx.(auth.StdTx); ok {
txSrc = stdTx.GetSource()
}
result = app.runMsgs(
ctx.WithValue(TxHashKey, txHash).WithValue(TxSourceKey, txSrc),
msgs,
mode)

if mode == sdk.RunTxModeSimulate {
return
Expand Down Expand Up @@ -884,7 +893,11 @@ func (app *BaseApp) ReRunTx(txBytes []byte, tx sdk.Tx) (result sdk.Result) {
}

var msgs = tx.GetMsgs()
result = app.runMsgs(ctx, msgs, txHash, mode)
var txSrc int64
if stdTx, ok := tx.(auth.StdTx); ok {
txSrc = stdTx.GetSource()
}
result = app.runMsgs(ctx.WithValue(TxHashKey, txHash).WithValue(TxSourceKey, txSrc), msgs, mode)

// only update state if all messages pass
if result.IsOK() {
Expand Down