RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect RBF transactions in explorer and API #237

Browse Source
This commit is contained in:
Martin Boehm 2019-07-30 16:43:13 +02:00
parent d450f1d315
commit d01fc3d914
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/types.go
View File

@ -191,6 +191,7 @@ type Tx struct {
ValueInSat *Amount `json:"valueIn,omitempty"` ValueInSat *Amount `json:"valueIn,omitempty"`
FeesSat *Amount `json:"fees,omitempty"` FeesSat *Amount `json:"fees,omitempty"`
Hex string `json:"hex,omitempty"` Hex string `json:"hex,omitempty"`
Rbf bool `json:"rbf,omitempty"`
CoinSpecificData interface{} `json:"-"` CoinSpecificData interface{} `json:"-"`
CoinSpecificJSON json.RawMessage `json:"-"` CoinSpecificJSON json.RawMessage `json:"-"`
TokenTransfers []TokenTransfer `json:"tokenTransfers,omitempty"` TokenTransfers []TokenTransfer `json:"tokenTransfers,omitempty"`

6
api/worker.go
View File

@ -142,6 +142,7 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height uint32,
var valInSat, valOutSat, feesSat big.Int var valInSat, valOutSat, feesSat big.Int
var pValInSat *big.Int var pValInSat *big.Int
vins := make([]Vin, len(bchainTx.Vin)) vins := make([]Vin, len(bchainTx.Vin))
rbf := false
for i := range bchainTx.Vin { for i := range bchainTx.Vin {
bchainVin := &bchainTx.Vin[i] bchainVin := &bchainTx.Vin[i]
vin := &vins[i] vin := &vins[i]
@ -149,6 +150,10 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height uint32,
vin.N = i vin.N = i
vin.Vout = bchainVin.Vout vin.Vout = bchainVin.Vout
vin.Sequence = int64(bchainVin.Sequence) vin.Sequence = int64(bchainVin.Sequence)
// detect explicit Replace-by-Fee transactions as defined by BIP125
if bchainTx.Confirmations == 0 && bchainVin.Sequence < 0xffffffff-1 {
rbf = true
}
vin.Hex = bchainVin.ScriptSig.Hex vin.Hex = bchainVin.ScriptSig.Hex
vin.Coinbase = bchainVin.Coinbase vin.Coinbase = bchainVin.Coinbase
if w.chainType == bchain.ChainBitcoinType { if w.chainType == bchain.ChainBitcoinType {
@ -317,6 +322,7 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height uint32,
ValueOutSat: (*Amount)(&valOutSat), ValueOutSat: (*Amount)(&valOutSat),
Version: bchainTx.Version, Version: bchainTx.Version,
Hex: bchainTx.Hex, Hex: bchainTx.Hex,
Rbf: rbf,
Vin: vins, Vin: vins,
Vout: vouts, Vout: vouts,
CoinSpecificData: bchainTx.CoinSpecificData, CoinSpecificData: bchainTx.CoinSpecificData,

1
static/templates/txdetail.html
View File

@ -3,6 +3,7 @@
<div class="row line-bot"> <div class="row line-bot">
<div class="col-xs-7 col-md-8 ellipsis"> <div class="col-xs-7 col-md-8 ellipsis">
<a href="/tx/{{$tx.Txid}}">{{$tx.Txid}}</a> <a href="/tx/{{$tx.Txid}}">{{$tx.Txid}}</a>
{{- if $tx.Rbf}}<span title="Replace-by-Fee (RBF) transaction, could be overriden"> ⚠️</span>{{end -}}
</div> </div>
{{- if $tx.Blocktime}}<div class="col-xs-5 col-md-4 text-muted text-right">{{if $tx.Confirmations}}mined{{else}}first seen{{end}} {{formatUnixTime $tx.Blocktime}}</div>{{end -}} {{- if $tx.Blocktime}}<div class="col-xs-5 col-md-4 text-muted text-right">{{if $tx.Confirmations}}mined{{else}}first seen{{end}} {{formatUnixTime $tx.Blocktime}}</div>{{end -}}
</div> </div>